diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-20 09:56:08 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-20 09:56:08 +0100 |
commit | a8f25c36f7322fd089e6d006b4e3708038882561 (patch) | |
tree | e8550a9f5c085ac9dc6b5f183ea9e50ecbfd2ae5 /drivers/md/bcache/request.c | |
parent | 225b3dc92da1a3198cf687b13435fef952757a8f (diff) | |
parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
download | linux-a8f25c36f7322fd089e6d006b4e3708038882561.tar.bz2 |
Merge branch 4.16-rc6 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md/bcache/request.c')
-rw-r--r-- | drivers/md/bcache/request.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 1a46b41dac70..6422846b546e 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -659,11 +659,11 @@ static void do_bio_hook(struct search *s, struct bio *orig_bio) static void search_free(struct closure *cl) { struct search *s = container_of(cl, struct search, cl); - bio_complete(s); if (s->iop.bio) bio_put(s->iop.bio); + bio_complete(s); closure_debug_destroy(cl); mempool_free(s, s->d->c->search); } |