From: Wei Yang <richardw.yang@linux.intel.com>
To: linux-nvdimm@lists.01.org
Cc: zwisler@kernel.org
Subject: [PATCH 4/5] libnvdimm, namespace: extract __init_active_labels to initialize labels for one nd_mapping
Date: Mon, 28 Jan 2019 08:30:17 +0800 [thread overview]
Message-ID: <20190128003018.4087-4-richardw.yang@linux.intel.com> (raw)
In-Reply-To: <20190128003018.4087-1-richardw.yang@linux.intel.com>
This is a preparation for next patch, so that init_active_labels not too
huge.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
---
drivers/nvdimm/namespace_devs.c | 41 ++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index 0d64c4b38a56..cdf3049bd2b9 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -2449,6 +2449,29 @@ static struct device **create_namespaces(struct nd_region *nd_region)
return devs;
}
+static int __init_active_labels(struct nd_mapping *nd_mapping, int count)
+{
+ struct nvdimm_drvdata *ndd = nd_mapping->ndd;
+ struct nd_label_ent *label_ent;
+ int j;
+
+ for (j = 0; j < count; j++) {
+ struct nd_namespace_label *label;
+
+ label_ent = kzalloc(sizeof(*label_ent), GFP_KERNEL);
+ if (!label_ent)
+ break;
+ label = nd_label_active(ndd, j);
+ label_ent->label = label;
+
+ mutex_lock(&nd_mapping->lock);
+ list_add_tail(&label_ent->list, &nd_mapping->labels);
+ mutex_unlock(&nd_mapping->lock);
+ }
+
+ return j;
+}
+
static int init_active_labels(struct nd_region *nd_region)
{
int i, errno = -ENOMEM;
@@ -2457,8 +2480,7 @@ static int init_active_labels(struct nd_region *nd_region)
struct nd_mapping *nd_mapping = &nd_region->mapping[i];
struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
struct nvdimm *nvdimm = nd_mapping->nvdimm;
- struct nd_label_ent *label_ent;
- int count, j;
+ int count;
/*
* If the dimm is disabled then we may need to prevent
@@ -2485,21 +2507,8 @@ static int init_active_labels(struct nd_region *nd_region)
count = nd_label_active_count(ndd);
dev_dbg(ndd->dev, "count: %d\n", count);
- for (j = 0; j < count; j++) {
- struct nd_namespace_label *label;
-
- label_ent = kzalloc(sizeof(*label_ent), GFP_KERNEL);
- if (!label_ent)
- break;
- label = nd_label_active(ndd, j);
- label_ent->label = label;
-
- mutex_lock(&nd_mapping->lock);
- list_add_tail(&label_ent->list, &nd_mapping->labels);
- mutex_unlock(&nd_mapping->lock);
- }
- if (j < count)
+ if (__init_active_labels(nd_mapping, count) < count)
goto error;
}
--
2.19.1
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2019-01-28 0:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-28 0:30 [PATCH 1/5] libnvdimm, namespace: release labels properly on error Wei Yang
2019-01-28 0:30 ` [PATCH 2/5] libnvdimm, namespace: remove special handling when count == 0 Wei Yang
2019-01-28 0:30 ` [PATCH 3/5] libnvdimm, label: return nd_label directly instead of calculating it again Wei Yang
2019-01-28 0:30 ` Wei Yang [this message]
2019-01-28 0:30 ` [PATCH 5/5] libnvdimm, namespace: allocate devs for namespace just once Wei Yang
2019-02-01 6:42 ` [PATCH 1/5] libnvdimm, namespace: release labels properly on error Wei Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190128003018.4087-4-richardw.yang@linux.intel.com \
--to=richardw.yang@linux.intel.com \
--cc=linux-nvdimm@lists.01.org \
--cc=zwisler@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox