diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-11-05 23:39:09 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-11-05 13:47:03 -0700 |
| commit | 9f173b33843552c48e0136e02e7362c8229c8e57 (patch) | |
| tree | 8768a6e18323a1df32da8a9dfad2fb0dc179f67e /drivers/block/nvme-core.c | |
| parent | a4aea5623d4a54682b6ff5c18196d7802f3e478f (diff) | |
| download | lwn-9f173b33843552c48e0136e02e7362c8229c8e57.tar.gz lwn-9f173b33843552c48e0136e02e7362c8229c8e57.zip | |
NVMe: blk_mq_alloc_request() returns error pointers
We recently converted this to blk_mq but the error checks have to be
updated to check for IS_ERR() instead of NULL.
Fixes: a4aea5623d4a ('NVMe: Convert to blk-mq')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/nvme-core.c')
| -rw-r--r-- | drivers/block/nvme-core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 39050a3d10fd..f7a87173e3f0 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -826,8 +826,8 @@ static int nvme_submit_async_admin_req(struct nvme_dev *dev) struct request *req; 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); 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; 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; 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, false); - if (!abort_req) + if (IS_ERR(abort_req)) return; 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) return NULL; ns->queue = blk_mq_init_queue(&dev->tagset); - if (!ns->queue) + if (IS_ERR(ns->queue)) goto out_free_ns; queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, ns->queue); queue_flag_set_unlocked(QUEUE_FLAG_NONROT, ns->queue); |