drivers: use req op accessor

The req operation REQ_OP is separated from the rq_flag_bits
definition. This converts the block layer drivers to
use req_op to get the op from the request struct.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

5 files changed, 12 insertions, 10 deletions

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index e9f1701af7cb..b9b737cafd5f 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -544,7 +544,7 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
         if (op_is_write(req_op(rq))) {
                 if (rq->cmd_flags & REQ_FLUSH)
                         ret = lo_req_flush(lo, rq);
-                else if (rq->cmd_flags & REQ_DISCARD)
+                else if (req_op(rq) == REQ_OP_DISCARD)
                         ret = lo_discard(lo, rq, pos);
                 else if (lo->transfer)
                         ret = lo_write_transfer(lo, rq, pos);
@@ -1659,8 +1659,8 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
         if (lo->lo_state != Lo_bound)
                 return -EIO;
 
-        if (lo->use_dio && !(cmd->rq->cmd_flags & (REQ_FLUSH |
-                                        REQ_DISCARD)))
+        if (lo->use_dio && (!(cmd->rq->cmd_flags & REQ_FLUSH) ||
+            req_op(cmd->rq) == REQ_OP_DISCARD))
                 cmd->use_aio = true;
         else
                 cmd->use_aio = false;
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 6053e4659fa2..8e3e708cb9ee 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -3765,7 +3765,7 @@ static int mtip_submit_request(struct blk_mq_hw_ctx *hctx, struct request *rq)
                         return -ENODATA;
         }
 
-        if (rq->cmd_flags & REQ_DISCARD) {
+        if (req_op(rq) == REQ_OP_DISCARD) {
                 int err;
 
                 err = mtip_send_trim(dd, blk_rq_pos(rq), blk_rq_sectors(rq));
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 31e73a7a40f2..6c2c28d124d0 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -282,7 +282,7 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)
 
         if (req->cmd_type == REQ_TYPE_DRV_PRIV)
                 type = NBD_CMD_DISC;
-        else if (req->cmd_flags & REQ_DISCARD)
+        else if (req_op(req) == REQ_OP_DISCARD)
                 type = NBD_CMD_TRIM;
         else if (req->cmd_flags & REQ_FLUSH)
                 type = NBD_CMD_FLUSH;
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 81666a56415e..450662055d97 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3286,9 +3286,9 @@ static void rbd_queue_workfn(struct work_struct *work)
                 goto err;
         }
 
-        if (rq->cmd_flags & REQ_DISCARD)
+        if (req_op(rq) == REQ_OP_DISCARD)
                 op_type = OBJ_OP_DISCARD;
-        else if (rq->cmd_flags & REQ_WRITE)
+        else if (req_op(rq) == REQ_OP_WRITE)
                 op_type = OBJ_OP_WRITE;
         else
                 op_type = OBJ_OP_READ;
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 52963a26660a..6fd160197b7a 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -844,7 +844,8 @@ static int blkif_queue_request(struct request *req, struct blkfront_ring_info *r
         if (unlikely(rinfo->dev_info->connected != BLKIF_STATE_CONNECTED))
                 return 1;
 
-        if (unlikely(req->cmd_flags & (REQ_DISCARD | REQ_SECURE)))
+        if (unlikely(req_op(req) == REQ_OP_DISCARD ||
+                     req->cmd_flags & REQ_SECURE))
                 return blkif_queue_discard_req(req, rinfo);
         else
                 return blkif_queue_rw_req(req, rinfo);
@@ -2054,8 +2055,9 @@ static int blkif_recover(struct blkfront_info *info)
                         /*
                          * Get the bios in the request so we can re-queue them.
                          */
-                        if (copy[i].request->cmd_flags &
-                            (REQ_FLUSH | REQ_FUA | REQ_DISCARD | REQ_SECURE)) {
+                        if (copy[i].request->cmd_flags & REQ_FLUSH ||
+                            req_op(copy[i].request) == REQ_OP_DISCARD ||
+                            copy[i].request->cmd_flags & (REQ_FUA | REQ_SECURE)) {
                                 /*
                                  * Flush operations don't contain bios, so
                                  * we need to requeue the whole request