Commit f2450f8a authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

ublk_drv: fix build warning with -Wmaybe-uninitialized and one sparse warning 



After applying -Wmaybe-uninitialized manually, two build warnings are
triggered:

drivers/block/ublk_drv.c:940:11: warning: ‘io’ may be used uninitialized [-Wmaybe-uninitialized]
  940 |         io->flags &= ~UBLK_IO_FLAG_ACTIVE;

drivers/block/ublk_drv.c: In function ‘ublk_ctrl_uring_cmd’:
drivers/block/ublk_drv.c:1531:9: warning: ‘ret’ may be used uninitialized [-Wmaybe-uninitialized]

Fix the 1st one by removing 'io->flags &= ~UBLK_IO_FLAG_ACTIVE;' which
isn't needed since the function always return successfully after setting
this flag.

Fix the 2nd one by always initializing 'ret'.

Also fix another sparse warning of 'sparse: sparse: incorrect type in return
expression' by changing return type of ublk_setup_iod().

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20220716095344.222674-1-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 020e3618

drivers/block/ublk_drv.c

+2 −4
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static inline unsigned int ublk_req_build_flags(struct request *req) 
	return flags;

}



static int ublk_setup_iod(struct ublk_queue *ubq, struct request *req)

static blk_status_t ublk_setup_iod(struct ublk_queue *ubq, struct request *req)

{

	struct ublksrv_io_desc *iod = ublk_get_iod(ubq, req->tag);

	struct ublk_io *io = &ubq->ios[req->tag];
@@ -937,7 +937,6 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags) 
	return -EIOCBQUEUED;



 out:

	io->flags &= ~UBLK_IO_FLAG_ACTIVE;

	io_uring_cmd_done(cmd, ret, 0);

	pr_devel("%s: complete: cmd op %d, tag %d ret %x io_flags %x\n",

			__func__, cmd_op, tag, ret, io->flags);
@@ -1299,13 +1298,12 @@ static int ublk_ctrl_get_queue_affinity(struct io_uring_cmd *cmd) 
	struct ublk_device *ub;

	unsigned long queue;

	unsigned int retlen;

	int ret;

	int ret = -EINVAL;



	ub = ublk_get_device_from_id(header->dev_id);

	if (!ub)

		goto out;



	ret = -EINVAL;

	queue = header->data[0];

	if (queue >= ub->dev_info.nr_hw_queues)

		goto out;