Commit 83b5df67 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

bcache: use op_is_sync to check for synchronous requests

(and remove one layer of masking for the op_is_write call next to it).
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 03ea4afa
...@@ -404,8 +404,8 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio) ...@@ -404,8 +404,8 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio)
if (!congested && if (!congested &&
mode == CACHE_MODE_WRITEBACK && mode == CACHE_MODE_WRITEBACK &&
op_is_write(bio_op(bio)) && op_is_write(bio->bi_opf) &&
(bio->bi_opf & REQ_SYNC)) op_is_sync(bio->bi_opf))
goto rescale; goto rescale;
spin_lock(&dc->io_lock); spin_lock(&dc->io_lock);
......
...@@ -57,8 +57,7 @@ static inline bool should_writeback(struct cached_dev *dc, struct bio *bio, ...@@ -57,8 +57,7 @@ static inline bool should_writeback(struct cached_dev *dc, struct bio *bio,
if (would_skip) if (would_skip)
return false; return false;
return bio->bi_opf & REQ_SYNC || return op_is_sync(bio->bi_opf) || in_use <= CUTOFF_WRITEBACK;
in_use <= CUTOFF_WRITEBACK;
} }
static inline void bch_writeback_queue(struct cached_dev *dc) static inline void bch_writeback_queue(struct cached_dev *dc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment