diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 22:21:28 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 22:21:28 +0200 |
commit | ed15e8880fc3d8d52bc02a02521054bfcb26264a (patch) | |
tree | 816a7f35028762976f5d4bc4df172e407c4bcbe2 /drivers/md/bcache/io.c | |
parent | staging: dgap: remove duplicate code (diff) | |
parent | Linux 4.2-rc3 (diff) | |
download | linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.tar.xz linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.zip |
Merge 4.2-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md/bcache/io.c')
-rw-r--r-- | drivers/md/bcache/io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/bcache/io.c b/drivers/md/bcache/io.c index cb64e64a4789..bf6a9ca18403 100644 --- a/drivers/md/bcache/io.c +++ b/drivers/md/bcache/io.c @@ -105,6 +105,7 @@ void bch_generic_make_request(struct bio *bio, struct bio_split_pool *p) } while (n != bio); continue_at(&s->cl, bch_bio_submit_split_done, NULL); + return; submit: generic_make_request(bio); } |