nvme: factor out a nvme_ns_remove_by_nsid helper

Factor out a piece of deeply indented and logicaly separate code
from nvme_scan_ns_list into a new helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 025a8a6d81c70d0ed55285f08fab640b6d1f6eb3..42102b81d5409f66c7bf68860a7173452f69afbc 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3699,6 +3699,16 @@ static void nvme_ns_remove(struct nvme_ns *ns)
        nvme_put_ns(ns);
 }
 
+static void nvme_ns_remove_by_nsid(struct nvme_ctrl *ctrl, u32 nsid)
+{
+       struct nvme_ns *ns = nvme_find_get_ns(ctrl, nsid);
+
+       if (ns) {
+               nvme_ns_remove(ns);
+               nvme_put_ns(ns);
+       }
+}
+
 static void nvme_validate_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 {
        struct nvme_ns *ns;
@@ -3732,7 +3742,6 @@ static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
 
 static int nvme_scan_ns_list(struct nvme_ctrl *ctrl, unsigned nn)
 {
-       struct nvme_ns *ns;
        __le32 *ns_list;
        unsigned i, j, nsid, prev = 0;
        unsigned num_lists = DIV_ROUND_UP_ULL((u64)nn, 1024);
@@ -3757,13 +3766,8 @@ static int nvme_scan_ns_list(struct nvme_ctrl *ctrl, unsigned nn)
 
                        nvme_validate_ns(ctrl, nsid);
 
-                       while (++prev < nsid) {
-                               ns = nvme_find_get_ns(ctrl, prev);
-                               if (ns) {
-                                       nvme_ns_remove(ns);
-                                       nvme_put_ns(ns);
-                               }
-                       }
+                       while (++prev < nsid)
+                               nvme_ns_remove_by_nsid(ctrl, prev);
                }
                nn -= j;
        }