diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-11-01 07:40:05 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-11-01 09:43:26 -0600 |
| commit | 83b5df67c50995ed93b2b7adac3f002ad8bb6069 (patch) | |
| tree | 1a4d54bf32b13f1235e45117e45299e6e8380a83 /drivers/md | |
| parent | 03ea4afa67566a3c4e83c0fde8bf0c48f16ac1a3 (diff) | |
| download | linux-stable-83b5df67c50995ed93b2b7adac3f002ad8bb6069.tar.gz linux-stable-83b5df67c50995ed93b2b7adac3f002ad8bb6069.tar.bz2 linux-stable-83b5df67c50995ed93b2b7adac3f002ad8bb6069.zip | |
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/bcache/request.c | 4 | ||||
| -rw-r--r-- | drivers/md/bcache/writeback.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 40ffe5e424b3..e8a2b693c928 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -404,8 +404,8 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio) if (!congested && mode == CACHE_MODE_WRITEBACK && - op_is_write(bio_op(bio)) && - (bio->bi_opf & REQ_SYNC)) + op_is_write(bio->bi_opf) && + op_is_sync(bio->bi_opf)) goto rescale; spin_lock(&dc->io_lock); diff --git a/drivers/md/bcache/writeback.h b/drivers/md/bcache/writeback.h index 301eaf565167..629bd1a502fd 100644 --- a/drivers/md/bcache/writeback.h +++ b/drivers/md/bcache/writeback.h @@ -57,8 +57,7 @@ static inline bool should_writeback(struct cached_dev *dc, struct bio *bio, if (would_skip) return false; - return bio->bi_opf & REQ_SYNC || - in_use <= CUTOFF_WRITEBACK; + return op_is_sync(bio->bi_opf) || in_use <= CUTOFF_WRITEBACK; } static inline void bch_writeback_queue(struct cached_dev *dc) |