|
@@ -826,8 +826,8 @@ static int nvme_submit_async_admin_req(struct nvme_dev *dev)
|
|
struct request *req;
|
|
struct request *req;
|
|
|
|
|
|
req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_KERNEL, false);
|
|
req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_KERNEL, false);
|
|
- if (!req)
|
|
|
|
- return -ENOMEM;
|
|
|
|
|
|
+ if (IS_ERR(req))
|
|
|
|
+ return PTR_ERR(req);
|
|
|
|
|
|
cmd_info = blk_mq_rq_to_pdu(req);
|
|
cmd_info = blk_mq_rq_to_pdu(req);
|
|
nvme_set_info(cmd_info, req, async_req_completion);
|
|
nvme_set_info(cmd_info, req, async_req_completion);
|
|
@@ -848,8 +848,8 @@ static int nvme_submit_admin_async_cmd(struct nvme_dev *dev,
|
|
struct nvme_cmd_info *cmd_rq;
|
|
struct nvme_cmd_info *cmd_rq;
|
|
|
|
|
|
req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_KERNEL, false);
|
|
req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_KERNEL, false);
|
|
- if (!req)
|
|
|
|
- return -ENOMEM;
|
|
|
|
|
|
+ if (IS_ERR(req))
|
|
|
|
+ return PTR_ERR(req);
|
|
|
|
|
|
req->timeout = timeout;
|
|
req->timeout = timeout;
|
|
cmd_rq = blk_mq_rq_to_pdu(req);
|
|
cmd_rq = blk_mq_rq_to_pdu(req);
|
|
@@ -1026,7 +1026,7 @@ static void nvme_abort_req(struct request *req)
|
|
|
|
|
|
abort_req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_ATOMIC,
|
|
abort_req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_ATOMIC,
|
|
false);
|
|
false);
|
|
- if (!abort_req)
|
|
|
|
|
|
+ if (IS_ERR(abort_req))
|
|
return;
|
|
return;
|
|
|
|
|
|
abort_cmd = blk_mq_rq_to_pdu(abort_req);
|
|
abort_cmd = blk_mq_rq_to_pdu(abort_req);
|
|
@@ -1884,7 +1884,7 @@ static struct nvme_ns *nvme_alloc_ns(struct nvme_dev *dev, unsigned nsid,
|
|
if (!ns)
|
|
if (!ns)
|
|
return NULL;
|
|
return NULL;
|
|
ns->queue = blk_mq_init_queue(&dev->tagset);
|
|
ns->queue = blk_mq_init_queue(&dev->tagset);
|
|
- if (!ns->queue)
|
|
|
|
|
|
+ if (IS_ERR(ns->queue))
|
|
goto out_free_ns;
|
|
goto out_free_ns;
|
|
queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, ns->queue);
|
|
queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, ns->queue);
|
|
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, ns->queue);
|
|
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, ns->queue);
|