From: Wei Yongjun <weiyj.lk@gmail.com> To: Dan Williams <dan.j.williams@intel.com> Cc: Wei Yongjun <weiyongjun1@huawei.com>, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org Subject: [PATCH -next] libnvdimm: fix error return code in __blk_label_update() Date: Mon, 17 Oct 2016 16:35:48 +0000 [thread overview] Message-ID: <1476722148-22795-1-git-send-email-weiyj.lk@gmail.com> (raw) From: Wei Yongjun <weiyongjun1@huawei.com> Fix to return error code -ENXIO from the nd_label_alloc_slot() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/nvdimm/label.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c index fac7cab..ab2927c 100644 --- a/drivers/nvdimm/label.c +++ b/drivers/nvdimm/label.c @@ -710,8 +710,10 @@ static int __blk_label_update(struct nd_region *nd_region, if (is_old_resource(res, old_res_list, old_num_resources)) continue; /* carry-over */ slot = nd_label_alloc_slot(ndd); - if (slot == UINT_MAX) + if (slot == UINT_MAX) { + rc = -ENXIO; goto abort; + } dev_dbg(ndd->dev, "%s: allocated: %d\n", __func__, slot); nd_label = nd_label_base(ndd) + slot; _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Wei Yongjun <weiyj.lk@gmail.com> To: Dan Williams <dan.j.williams@intel.com> Cc: Wei Yongjun <weiyongjun1@huawei.com>, linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org Subject: [PATCH -next] libnvdimm: fix error return code in __blk_label_update() Date: Mon, 17 Oct 2016 16:35:48 +0000 [thread overview] Message-ID: <1476722148-22795-1-git-send-email-weiyj.lk@gmail.com> (raw) From: Wei Yongjun <weiyongjun1@huawei.com> Fix to return error code -ENXIO from the nd_label_alloc_slot() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/nvdimm/label.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c index fac7cab..ab2927c 100644 --- a/drivers/nvdimm/label.c +++ b/drivers/nvdimm/label.c @@ -710,8 +710,10 @@ static int __blk_label_update(struct nd_region *nd_region, if (is_old_resource(res, old_res_list, old_num_resources)) continue; /* carry-over */ slot = nd_label_alloc_slot(ndd); - if (slot == UINT_MAX) + if (slot == UINT_MAX) { + rc = -ENXIO; goto abort; + } dev_dbg(ndd->dev, "%s: allocated: %d\n", __func__, slot); nd_label = nd_label_base(ndd) + slot;
next reply other threads:[~2016-10-17 16:35 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-17 16:35 Wei Yongjun [this message] 2016-10-17 16:35 ` [PATCH -next] libnvdimm: fix error return code in __blk_label_update() Wei Yongjun
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=1476722148-22795-1-git-send-email-weiyj.lk@gmail.com \ --to=weiyj.lk@gmail.com \ --cc=dan.j.williams@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ --cc=weiyongjun1@huawei.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.