From: Wei Yang <richardw.yang@linux.intel.com>
To: Wei Yang <richardw.yang@linux.intel.com>
Cc: zwisler@kernel.org, linux-nvdimm@lists.01.org
Subject: Re: [PATCH 1/5] libnvdimm, namespace: release labels properly on error
Date: Fri, 1 Feb 2019 14:42:28 +0800 [thread overview]
Message-ID: <20190201064228.GA29739@richard> (raw)
In-Reply-To: <20190128003018.4087-1-richardw.yang@linux.intel.com>
On Mon, Jan 28, 2019 at 08:30:14AM +0800, Wei Yang wrote:
>In init_active_labels(), it iterates on ndr_mappings to create its
>corresponding labels. When there is an error, it is supposed to release
>those labels created. But current implementation doesn't handle this
>well in two aspects:
>
> * when error happens during ndd check, labels are not released
> * just labels on current nd_mapping released, previous ones are lost
>
>This patch extracts labels releasing code to error branch and release
>labels on all nd_mapping besides only current one. By goto error branch
>on error, it release all labels allocated.
Is my understanding correct?
>
>Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
>---
> drivers/nvdimm/namespace_devs.c | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
>index 9471b9ca04f5..234c0c79726a 100644
>--- a/drivers/nvdimm/namespace_devs.c
>+++ b/drivers/nvdimm/namespace_devs.c
>@@ -2451,7 +2451,7 @@ static struct device **create_namespaces(struct nd_region *nd_region)
>
> static int init_active_labels(struct nd_region *nd_region)
> {
>- int i;
>+ int i, errno = -ENOMEM;
>
> for (i = 0; i < nd_region->ndr_mappings; i++) {
> struct nd_mapping *nd_mapping = &nd_region->mapping[i];
>@@ -2476,7 +2476,8 @@ static int init_active_labels(struct nd_region *nd_region)
> dev_name(&nd_mapping->nvdimm->dev),
> test_bit(NDD_LOCKED, &nvdimm->flags)
> ? "locked" : "disabled");
>- return -ENXIO;
>+ errno = -ENXIO;
>+ goto error;
> }
> nd_mapping->ndd = ndd;
> atomic_inc(&nvdimm->busy);
>@@ -2500,16 +2501,20 @@ static int init_active_labels(struct nd_region *nd_region)
> mutex_unlock(&nd_mapping->lock);
> }
>
>- if (j >= count)
>- continue;
>+ if (j < count)
>+ goto error;
>+ }
>+
>+ return 0;
>
>+error:
>+ for (; i >= 0; i--) {
>+ struct nd_mapping *nd_mapping = &nd_region->mapping[i];
> mutex_lock(&nd_mapping->lock);
> nd_mapping_free_labels(nd_mapping);
> mutex_unlock(&nd_mapping->lock);
>- return -ENOMEM;
> }
>-
>- return 0;
>+ return errno;
> }
>
> int nd_region_register_namespaces(struct nd_region *nd_region, int *err)
>--
>2.19.1
--
Wei Yang
Help you, Help me
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
prev parent reply other threads:[~2019-02-01 6:42 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 ` [PATCH 4/5] libnvdimm, namespace: extract __init_active_labels to initialize labels for one nd_mapping Wei Yang
2019-01-28 0:30 ` [PATCH 5/5] libnvdimm, namespace: allocate devs for namespace just once Wei Yang
2019-02-01 6:42 ` Wei Yang [this message]
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=20190201064228.GA29739@richard \
--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