block: rename bio bi_rw to bi_opf

Since commit 63a4cc24867d, bio->bi_rw contains flags in the lower
portion and the op code in the higher portions. This means that
old code that relies on manually setting bi_rw is most likely
going to be broken. Instead of letting that brokeness linger,
rename the member, to force old and out-of-tree code to break
at compile time instead of at runtime.

No intended functional changes in this commit.

Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index c5494e403239..f1aba26f4719 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -821,8 +821,8 @@ static void throtl_charge_bio(struct throtl_grp *tg, struct bio *bio)
          * second time when it eventually gets issued.  Set it when a bio
          * is being charged to a tg.
          */
-        if (!(bio->bi_rw & REQ_THROTTLED))
-                bio->bi_rw |= REQ_THROTTLED;
+        if (!(bio->bi_opf & REQ_THROTTLED))
+                bio->bi_opf |= REQ_THROTTLED;
 }
 
 /**
@@ -1399,7 +1399,7 @@ bool blk_throtl_bio(struct request_queue *q, struct blkcg_gq *blkg,
         WARN_ON_ONCE(!rcu_read_lock_held());
 
         /* see throtl_charge_bio() */
-        if ((bio->bi_rw & REQ_THROTTLED) || !tg->has_rules[rw])
+        if ((bio->bi_opf & REQ_THROTTLED) || !tg->has_rules[rw])
                 goto out;
 
         spin_lock_irq(q->queue_lock);
@@ -1478,7 +1478,7 @@ out:
          * being issued.
          */
         if (!throttled)
-                bio->bi_rw &= ~REQ_THROTTLED;
+                bio->bi_opf &= ~REQ_THROTTLED;
         return throttled;
 }