diff options
| author | Jens Axboe <axboe@fb.com> | 2017-01-27 15:08:31 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-27 15:08:31 -0700 |
| commit | f924ba70c1b12706c6679d793202e8f4c125f7ae (patch) | |
| tree | 978f8f56ccfa7c6fdb4be4ac6e498d73d44bf14f /drivers/md/bcache/request.c | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
| parent | 400f73b23f457a82288814e21af57dbc9f3f2afd (diff) | |
Merge branch 'for-4.11/block' into for-4.11/rq-refactor
Signed-off-by: Jens Axboe <axboe@fb.com>
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 76d20875503c..01035e718c1c 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -666,7 +666,7 @@ static inline struct search *search_alloc(struct bio *bio, s->iop.write_prio = 0; s->iop.error = 0; s->iop.flags = 0; - s->iop.flush_journal = (bio->bi_opf & (REQ_PREFLUSH|REQ_FUA)) != 0; + s->iop.flush_journal = op_is_flush(bio->bi_opf); s->iop.wq = bcache_wq; return s; |