diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-20 06:27:18 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-20 06:27:18 -0400 |
commit | 4958134df54c2c84e9c22ea042761d439164d26e (patch) | |
tree | 503177afab11f7d25b12a84ce25b481d305c51ba /drivers/md/bcache/request.c | |
parent | c4f528795d1add8b63652673f7262729f679c6c1 (diff) | |
parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) |
Merge 4.16-rc6 into tty-next
We want the serial/tty 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) | |||
659 | static void search_free(struct closure *cl) | 659 | static void search_free(struct closure *cl) |
660 | { | 660 | { |
661 | struct search *s = container_of(cl, struct search, cl); | 661 | struct search *s = container_of(cl, struct search, cl); |
662 | bio_complete(s); | ||
663 | 662 | ||
664 | if (s->iop.bio) | 663 | if (s->iop.bio) |
665 | bio_put(s->iop.bio); | 664 | bio_put(s->iop.bio); |
666 | 665 | ||
666 | bio_complete(s); | ||
667 | closure_debug_destroy(cl); | 667 | closure_debug_destroy(cl); |
668 | mempool_free(s, s->d->c->search); | 668 | mempool_free(s, s->d->c->search); |
669 | } | 669 | } |