blk-mq: use BLK_MQ_NO_TAG for no tag

Replace various magic -1 constants for tags with BLK_MQ_NO_TAG.

Signed-off-by: Xianting Tian <tian.xianting@h3c.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 11661f5b64d606cc53476d1e851bf5605d60612f..062efdedc9946374c67a1368da62f8abf60b3cec 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -116,8 +116,8 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
        rq->__sector = (sector_t) -1;
        INIT_HLIST_NODE(&rq->hash);
        RB_CLEAR_NODE(&rq->rb_node);
-       rq->tag = -1;
-       rq->internal_tag = -1;
+       rq->tag = BLK_MQ_NO_TAG;
+       rq->internal_tag = BLK_MQ_NO_TAG;
        rq->start_time_ns = ktime_get_ns();
        rq->part = NULL;
        refcount_set(&rq->ref, 1);

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 205d9716f7a5cd789020a51201917fd81b460a9e..501a85ceaccb6dd07890a2d5f6f6ed973467a66f 100644 (file)
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -475,7 +475,7 @@ void blk_mq_sched_insert_request(struct request *rq, bool at_head,
                goto run;
        }
 
-       WARN_ON(e && (rq->tag != -1));
+       WARN_ON(e && (rq->tag != BLK_MQ_NO_TAG));
 
        if (blk_mq_sched_bypass_insert(hctx, !!e, rq)) {
                /*