|
Hannes Reinecke |
71f5be |
From: Edmund Nadolski <edmund.nadolski@intel.com>
|
|
Hannes Reinecke |
71f5be |
Date: Wed, 27 Nov 2019 10:17:43 -0700
|
|
Hannes Reinecke |
71f5be |
Subject: [PATCH] nvme: remove unused return code from nvme_alloc_ns
|
|
Hannes Reinecke |
71f5be |
Git-commit: adce7e9856798d4883f42c3d8429123707fa34e8
|
|
Michal Kubecek |
66e035 |
Patch-mainline: v5.7-rc1
|
|
Hannes Reinecke |
71f5be |
References: bsc#1169045
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
The return code of nvme_alloc_ns is never used, so change it
|
|
Hannes Reinecke |
71f5be |
to void.
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
|
Hannes Reinecke |
71f5be |
Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com>
|
|
Hannes Reinecke |
71f5be |
Signed-off-by: Keith Busch <kbusch@kernel.org>
|
|
Hannes Reinecke |
71f5be |
Acked-by: Hannes Reinecke <hare@suse.com>
|
|
Hannes Reinecke |
71f5be |
---
|
|
Hannes Reinecke |
71f5be |
drivers/nvme/host/core.c | 21 ++++++---------------
|
|
Hannes Reinecke |
71f5be |
1 file changed, 6 insertions(+), 15 deletions(-)
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
|
Hannes Reinecke |
71f5be |
index a4d8c90ee7cc..414076aaf52b 100644
|
|
Hannes Reinecke |
71f5be |
--- a/drivers/nvme/host/core.c
|
|
Hannes Reinecke |
71f5be |
+++ b/drivers/nvme/host/core.c
|
|
Hannes Reinecke |
71f5be |
@@ -3480,7 +3480,7 @@ static int nvme_setup_streams_ns(struct nvme_ctrl *ctrl, struct nvme_ns *ns)
|
|
Hannes Reinecke |
71f5be |
return 0;
|
|
Hannes Reinecke |
71f5be |
}
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
-static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
|
|
Hannes Reinecke |
71f5be |
+static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
|
|
Hannes Reinecke |
71f5be |
{
|
|
Hannes Reinecke |
71f5be |
struct nvme_ns *ns;
|
|
Hannes Reinecke |
71f5be |
struct gendisk *disk;
|
|
Hannes Reinecke |
71f5be |
@@ -3490,13 +3490,11 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
ns = kzalloc_node(sizeof(*ns), GFP_KERNEL, node);
|
|
Hannes Reinecke |
71f5be |
if (!ns)
|
|
Hannes Reinecke |
71f5be |
- return -ENOMEM;
|
|
Hannes Reinecke |
71f5be |
+ return;
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
ns->queue = blk_mq_init_queue(ctrl->tagset);
|
|
Hannes Reinecke |
71f5be |
- if (IS_ERR(ns->queue)) {
|
|
Hannes Reinecke |
71f5be |
- ret = PTR_ERR(ns->queue);
|
|
Hannes Reinecke |
71f5be |
+ if (IS_ERR(ns->queue))
|
|
Hannes Reinecke |
71f5be |
goto out_free_ns;
|
|
Hannes Reinecke |
71f5be |
- }
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
if (ctrl->opts && ctrl->opts->data_digest)
|
|
Hannes Reinecke |
71f5be |
ns->queue->backing_dev_info->capabilities
|
|
Hannes Reinecke |
71f5be |
@@ -3519,10 +3517,8 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
|
|
Hannes Reinecke |
71f5be |
if (ret)
|
|
Hannes Reinecke |
71f5be |
goto out_free_queue;
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
- if (id->ncap == 0) {
|
|
Hannes Reinecke |
71f5be |
- ret = -EINVAL;
|
|
Hannes Reinecke |
71f5be |
+ if (id->ncap == 0) /* no namespace (legacy quirk) */
|
|
Hannes Reinecke |
71f5be |
goto out_free_id;
|
|
Hannes Reinecke |
71f5be |
- }
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
ret = nvme_init_ns_head(ns, nsid, id);
|
|
Hannes Reinecke |
71f5be |
if (ret)
|
|
Hannes Reinecke |
71f5be |
@@ -3531,10 +3527,8 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
|
|
Hannes Reinecke |
71f5be |
nvme_set_disk_name(disk_name, ns, ctrl, &flags);
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
disk = alloc_disk_node(0, node);
|
|
Hannes Reinecke |
71f5be |
- if (!disk) {
|
|
Hannes Reinecke |
71f5be |
- ret = -ENOMEM;
|
|
Hannes Reinecke |
71f5be |
+ if (!disk)
|
|
Hannes Reinecke |
71f5be |
goto out_unlink_ns;
|
|
Hannes Reinecke |
71f5be |
- }
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
disk->fops = &nvme_fops;
|
|
Hannes Reinecke |
71f5be |
disk->private_data = ns;
|
|
Hannes Reinecke |
71f5be |
@@ -3565,7 +3559,7 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
|
|
Hannes Reinecke |
71f5be |
nvme_fault_inject_init(&ns->fault_inject, ns->disk->disk_name);
|
|
Hannes Reinecke |
71f5be |
kfree(id);
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
- return 0;
|
|
Hannes Reinecke |
71f5be |
+ return;
|
|
Hannes Reinecke |
71f5be |
out_put_disk:
|
|
Hannes Reinecke |
71f5be |
put_disk(ns->disk);
|
|
Hannes Reinecke |
71f5be |
out_unlink_ns:
|
|
Hannes Reinecke |
71f5be |
@@ -3579,9 +3573,6 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
|
|
Hannes Reinecke |
71f5be |
blk_cleanup_queue(ns->queue);
|
|
Hannes Reinecke |
71f5be |
out_free_ns:
|
|
Hannes Reinecke |
71f5be |
kfree(ns);
|
|
Hannes Reinecke |
71f5be |
- if (ret > 0)
|
|
Hannes Reinecke |
71f5be |
- ret = blk_status_to_errno(nvme_error_status(ret));
|
|
Hannes Reinecke |
71f5be |
- return ret;
|
|
Hannes Reinecke |
71f5be |
}
|
|
Hannes Reinecke |
71f5be |
|
|
Hannes Reinecke |
71f5be |
static void nvme_ns_remove(struct nvme_ns *ns)
|
|
Hannes Reinecke |
71f5be |
--
|
|
Hannes Reinecke |
71f5be |
2.16.4
|
|
Hannes Reinecke |
71f5be |
|