Commit f85e254b authored by Caleb Sander Mateos's avatar Caleb Sander Mateos Committed by Jens Axboe
Browse files

ublk: remove redundant zone op check in ublk_setup_iod() 



ublk_setup_iod() checks first whether the request is a zoned operation
issued to a device without zoned support and returns BLK_STS_IOERR if
so. However, such a request would already hit the default case in the
subsequent switch statement and fail the ublk_queue_is_zoned() check,
which also results in a return of BLK_STS_IOERR. So remove the redundant
early check for unsupported zone ops.

Signed-off-by: default avatarCaleb Sander Mateos <csander@purestorage.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7378b003

drivers/block/ublk_drv.c

+0 −5
Original line number Diff line number Diff line
@@ -1105,13 +1105,8 @@ 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];

	enum req_op op = req_op(req);

	u32 ublk_op;



	if (!ublk_queue_is_zoned(ubq) &&

	    (op_is_zone_mgmt(op) || op == REQ_OP_ZONE_APPEND))

		return BLK_STS_IOERR;



	switch (req_op(req)) {

	case REQ_OP_READ:

		ublk_op = UBLK_IO_OP_READ;