]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ublk: remove unnecessary checks in ublk_check_and_get_req()
authorCaleb Sander Mateos <csander@purestorage.com>
Sat, 8 Nov 2025 22:17:45 +0000 (15:17 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 11 Nov 2025 14:57:05 +0000 (07:57 -0700)
ub = iocb->ki_filp->private_data cannot be NULL, as it's set in
ublk_ch_open() before it returns succesfully. req->mq_hctx cannot be
NULL as any inflight ublk request must belong to some queue. And
req->mq_hctx->driver_data cannot be NULL as it's set to the ublk_queue
pointer in ublk_init_hctx(). So drop the unnecessary checks.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/ublk_drv.c

index 5cf288809226b2b8c7fe308f76b361640866af31..30e798f062ef29a9726748135bc1541e754260cc 100644 (file)
@@ -2508,9 +2508,6 @@ static struct request *ublk_check_and_get_req(struct kiocb *iocb,
        size_t buf_off;
        u16 tag, q_id;
 
-       if (!ub)
-               return ERR_PTR(-EACCES);
-
        if (!user_backed_iter(iter))
                return ERR_PTR(-EACCES);
 
@@ -2536,9 +2533,6 @@ static struct request *ublk_check_and_get_req(struct kiocb *iocb,
        if (!req)
                return ERR_PTR(-EINVAL);
 
-       if (!req->mq_hctx || !req->mq_hctx->driver_data)
-               goto fail;
-
        if (!ublk_check_ubuf_dir(req, dir))
                goto fail;