[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1476722148-22795-1-git-send-email-weiyj.lk@gmail.com>
Date: Mon, 17 Oct 2016 16:35:48 +0000
From: Wei Yongjun <weiyj.lk@...il.com>
To: Dan Williams <dan.j.williams@...el.com>
Cc: Wei Yongjun <weiyongjun1@...wei.com>, linux-nvdimm@...ts.01.org,
linux-kernel@...r.kernel.org
Subject: [PATCH -next] libnvdimm: fix error return code in __blk_label_update()
From: Wei Yongjun <weiyongjun1@...wei.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@...wei.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;
Powered by blists - more mailing lists