diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2013-09-17 14:38:18 -0700 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2013-09-18 13:39:23 -0700 |
| commit | 240ede5e1920c0282e3bfce3432d2c706ad4912d (patch) | |
| tree | a754c4b786133bed48a39a45c787b751755e8205 | |
| parent | 12bd13ba67db0757a99729a32630dce0507aee6d (diff) | |
bcache: Possible flush fixHEADbcache-3.10-stable
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
| -rw-r--r-- | drivers/md/bcache/request.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index afb9a998a737..c06840be2d5a 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -1053,19 +1053,21 @@ static void request_write(struct cached_dev *dc, struct search *s) trace_bcache_writethrough(s->orig_bio); closure_bio_submit(bio, cl, s->d); } else { + s->op.cache_bio = bio; trace_bcache_writeback(s->orig_bio); bch_writeback_add(dc, bio_sectors(bio)); - if (s->op.flush_journal) { + if (bio->bi_rw & REQ_FLUSH) { /* Also need to send a flush to the backing device */ - s->op.cache_bio = bio_clone_bioset(bio, GFP_NOIO, - dc->disk.bio_split); - - bio->bi_size = 0; - bio->bi_vcnt = 0; - closure_bio_submit(bio, cl, s->d); - } else { - s->op.cache_bio = bio; + struct bio *flush = bio_alloc_bioset(0, GFP_NOIO, + dc->disk.bio_split); + + flush->bi_rw = WRITE_FLUSH; + flush->bi_bdev = bio->bi_bdev; + flush->bi_end_io = request_endio; + flush->bi_private = cl; + + closure_bio_submit(flush, cl, s->d); } } out: |