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 --- drivers/block/ublk_drv.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 5cf288809226..30e798f062ef 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -2506,13 +2506,10 @@ static struct request *ublk_check_and_get_req(struct kiocb *iocb, struct ublk_queue *ubq; struct request *req; size_t buf_off; u16 tag, q_id; - if (!ub) - return ERR_PTR(-EACCES); - if (!user_backed_iter(iter)) return ERR_PTR(-EACCES); if (ub->dev_info.state == UBLK_S_DEV_DEAD) return ERR_PTR(-EACCES); @@ -2534,13 +2531,10 @@ static struct request *ublk_check_and_get_req(struct kiocb *iocb, *io = &ubq->ios[tag]; req = __ublk_check_and_get_req(ub, q_id, tag, *io, buf_off); 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; *off = buf_off; return req; -- 2.45.2