summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorBart Van Assche <bvanassche@acm.org>2019-12-17 16:23:29 -0800
committerJens Axboe <axboe@kernel.dk>2019-12-20 11:52:01 -0700
commitc44a4edb20938c85b64a256661443039f5bffdea (patch)
tree0b8043315d2526a868b3b1bc79fb8d14ce52f200 /block
parentc58c1f83436b501d45d4050fd1296d71a9760bcb (diff)
downloadlinux-stable-c44a4edb20938c85b64a256661443039f5bffdea.tar.gz
linux-stable-c44a4edb20938c85b64a256661443039f5bffdea.tar.bz2
linux-stable-c44a4edb20938c85b64a256661443039f5bffdea.zip
block: Fix the type of 'sts' in bsg_queue_rq()
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>
Diffstat (limited to 'block')
-rw-r--r--block/bsg-lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index 347dda16c2f4..6cbb7926534c 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -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);