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)