block: Fix the type of 'sts' in bsg_queue_rq()
authorBart Van Assche <bvanassche@acm.org>
Wed, 18 Dec 2019 00:23:29 +0000 (16:23 -0800)
committerJens Axboe <axboe@kernel.dk>
Fri, 20 Dec 2019 18:52:01 +0000 (11:52 -0700)
This patch fixes the following sparse warnings:

block/bsg-lib.c:269:19: warning: incorrect type in initializer (different base types)
block/bsg-lib.c:269:19:    expected int sts
block/bsg-lib.c:269:19:    got restricted blk_status_t [usertype]
block/bsg-lib.c:286:16: warning: incorrect type in return expression (different base types)
block/bsg-lib.c:286:16:    expected restricted blk_status_t
block/bsg-lib.c:286:16:    got int [assigned] sts

Cc: Martin Wilck <mwilck@suse.com>
Fixes: d46fe2cb2dce ("block: drop device references in bsg_queue_rq()")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bsg-lib.c

index 347dda16c2f46a48d87cc234a57a4ced250a4646..6cbb7926534cd7985e22ce280c4b29c66a900826 100644 (file)
@@ -266,7 +266,7 @@ static blk_status_t bsg_queue_rq(struct blk_mq_hw_ctx *hctx,
        struct request *req = bd->rq;
        struct bsg_set *bset =
                container_of(q->tag_set, struct bsg_set, tag_set);
-       int sts = BLK_STS_IOERR;
+       blk_status_t sts = BLK_STS_IOERR;
        int ret;
 
        blk_mq_start_request(req);