* [PATCH v3 0/1] A few code cleanups @ 2019-11-27 17:17 Edmund Nadolski 2019-11-27 17:17 ` [PATCH v3 1/1] nvme: remove unused return code from nvme_alloc_ns Edmund Nadolski 0 siblings, 1 reply; 4+ messages in thread From: Edmund Nadolski @ 2019-11-27 17:17 UTC (permalink / raw) To: edmund.nadolski, linux-nvme, kbusch v3: A few further tweaks: - No additional messages needed for kmalloc failures. - No message needed for legacy 'no namespaces' condition. v2: Emit informational message when an error occurs. Edmund Nadolski (1): nvme: remove unused return code from nvme_alloc_ns drivers/nvme/host/core.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) -- 2.20.1 _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3 1/1] nvme: remove unused return code from nvme_alloc_ns 2019-11-27 17:17 [PATCH v3 0/1] A few code cleanups Edmund Nadolski @ 2019-11-27 17:17 ` Edmund Nadolski 2019-11-28 7:30 ` Christoph Hellwig 0 siblings, 1 reply; 4+ messages in thread From: Edmund Nadolski @ 2019-11-27 17:17 UTC (permalink / raw) To: edmund.nadolski, linux-nvme, kbusch The return code of nvme_alloc_ns is never used, so change it to void. Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com> --- drivers/nvme/host/core.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index e6ee34376c5e..34ef1e4e0799 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3486,7 +3486,7 @@ static int nvme_setup_streams_ns(struct nvme_ctrl *ctrl, struct nvme_ns *ns) return 0; } -static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) +static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) { struct nvme_ns *ns; struct gendisk *disk; @@ -3496,13 +3496,11 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) ns = kzalloc_node(sizeof(*ns), GFP_KERNEL, node); if (!ns) - return -ENOMEM; + return; ns->queue = blk_mq_init_queue(ctrl->tagset); - if (IS_ERR(ns->queue)) { - ret = PTR_ERR(ns->queue); + if (IS_ERR(ns->queue)) goto out_free_ns; - } if (ctrl->opts && ctrl->opts->data_digest) ns->queue->backing_dev_info->capabilities @@ -3525,10 +3523,8 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) if (ret) goto out_free_queue; - if (id->ncap == 0) { - ret = -EINVAL; + if (id->ncap == 0) /* no namespace (legacy quirk) */ goto out_free_id; - } ret = nvme_init_ns_head(ns, nsid, id); if (ret) @@ -3537,10 +3533,8 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) nvme_set_disk_name(disk_name, ns, ctrl, &flags); disk = alloc_disk_node(0, node); - if (!disk) { - ret = -ENOMEM; + if (!disk) goto out_unlink_ns; - } disk->fops = &nvme_fops; disk->private_data = ns; @@ -3571,7 +3565,7 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) nvme_fault_inject_init(&ns->fault_inject, ns->disk->disk_name); kfree(id); - return 0; + return; out_put_disk: put_disk(ns->disk); out_unlink_ns: @@ -3585,9 +3579,6 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) blk_cleanup_queue(ns->queue); out_free_ns: kfree(ns); - if (ret > 0) - ret = blk_status_to_errno(nvme_error_status(ret)); - return ret; } static void nvme_ns_remove(struct nvme_ns *ns) -- 2.20.1 _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 1/1] nvme: remove unused return code from nvme_alloc_ns 2019-11-27 17:17 ` [PATCH v3 1/1] nvme: remove unused return code from nvme_alloc_ns Edmund Nadolski @ 2019-11-28 7:30 ` Christoph Hellwig 2019-12-16 15:39 ` Nadolski, Edmund 0 siblings, 1 reply; 4+ messages in thread From: Christoph Hellwig @ 2019-11-28 7:30 UTC (permalink / raw) To: Edmund Nadolski; +Cc: kbusch, linux-nvme Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de> _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3 1/1] nvme: remove unused return code from nvme_alloc_ns 2019-11-28 7:30 ` Christoph Hellwig @ 2019-12-16 15:39 ` Nadolski, Edmund 0 siblings, 0 replies; 4+ messages in thread From: Nadolski, Edmund @ 2019-12-16 15:39 UTC (permalink / raw) To: kbusch; +Cc: linux-nvme On 11/28/2019 12:30 AM, Christoph Hellwig wrote: > Looks good, > > Reviewed-by: Christoph Hellwig <hch@lst.de> Keith, all... any further feedback/comment? Thanks, Ed _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-16 15:40 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-11-27 17:17 [PATCH v3 0/1] A few code cleanups Edmund Nadolski 2019-11-27 17:17 ` [PATCH v3 1/1] nvme: remove unused return code from nvme_alloc_ns Edmund Nadolski 2019-11-28 7:30 ` Christoph Hellwig 2019-12-16 15:39 ` Nadolski, Edmund
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).