3 files changed, 8 insertions, 8 deletions

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index 69f16f43f8ab..4b177fe11ebb 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -208,7 +208,7 @@ static void bch_data_insert_start(struct closure *cl)
          * Journal writes are marked REQ_PREFLUSH; if the original write was a
          * flush, it'll wait on the journal write.
          */
-        bio->bi_rw &= ~(REQ_PREFLUSH|REQ_FUA);
+        bio->bi_opf &= ~(REQ_PREFLUSH|REQ_FUA);
 
         do {
                 unsigned i;
@@ -405,7 +405,7 @@ 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_rw & REQ_SYNC))
+            (bio->bi_opf & REQ_SYNC))
                 goto rescale;
 
         spin_lock(&dc->io_lock);
@@ -668,7 +668,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_rw & (REQ_PREFLUSH|REQ_FUA)) != 0;
+        s->iop.flush_journal    = (bio->bi_opf & (REQ_PREFLUSH|REQ_FUA)) != 0;
         s->iop.wq               = bcache_wq;
 
         return s;
@@ -796,8 +796,8 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s,
                 goto out_submit;
         }
 
-        if (!(bio->bi_rw & REQ_RAHEAD) &&
-            !(bio->bi_rw & REQ_META) &&
+        if (!(bio->bi_opf & REQ_RAHEAD) &&
+            !(bio->bi_opf & REQ_META) &&
             s->iop.c->gc_stats.in_use < CUTOFF_CACHE_READA)
                 reada = min_t(sector_t, dc->readahead >> 9,
                               bdev_sectors(bio->bi_bdev) - bio_end_sector(bio));
@@ -920,7 +920,7 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s)
                 bch_writeback_add(dc);
                 s->iop.bio = bio;
 
-                if (bio->bi_rw & REQ_PREFLUSH) {
+                if (bio->bi_opf & REQ_PREFLUSH) {
                         /* Also need to send a flush to the backing device */
                         struct bio *flush = bio_alloc_bioset(GFP_NOIO, 0,
                                                              dc->disk.bio_split);
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 88ef6d14cce3..95a4ca6ce6ff 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -347,7 +347,7 @@ static void uuid_io(struct cache_set *c, int op, unsigned long op_flags,
         for (i = 0; i < KEY_PTRS(k); i++) {
                 struct bio *bio = bch_bbio_alloc(c);
 
-                bio->bi_rw      = REQ_SYNC|REQ_META|op_flags;
+                bio->bi_opf = REQ_SYNC | REQ_META | op_flags;
                 bio->bi_iter.bi_size = KEY_SIZE(k) << 9;
 
                 bio->bi_end_io  = uuid_endio;
diff --git a/drivers/md/bcache/writeback.h b/drivers/md/bcache/writeback.h
index 073a042aed24..301eaf565167 100644
--- a/drivers/md/bcache/writeback.h
+++ b/drivers/md/bcache/writeback.h
@@ -57,7 +57,7 @@ static inline bool should_writeback(struct cached_dev *dc, struct bio *bio,
         if (would_skip)
                 return false;
 
-        return bio->bi_rw & REQ_SYNC ||
+        return bio->bi_opf & REQ_SYNC ||
                 in_use <= CUTOFF_WRITEBACK;
 }