From: Dan Williams <dan.j.williams@intel.com>
Date: Sun, 13 Dec 2015 19:35:52 +0000 (-0800)
Subject: libnvdimm, pfn: fix nd_pfn_validate() return value handling
X-Git-Tag: v4.1.12-92~18^2^2~44
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=16ecfba746d760858e043611126db27e7a2d9eb3;p=users%2Fjedix%2Flinux-maple.git

libnvdimm, pfn: fix nd_pfn_validate() return value handling

Orabug: 22913653

The -ENODEV case indicates that the info-block needs to established.
All other return codes cause nd_pfn_init() to abort.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
(cherry picked from commit 3fa962686568a1617d174e3d2f5d522e963077c5)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 47c1cde749054..3bfa90644b092 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -237,7 +237,9 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
 
 	nd_pfn->pfn_sb = pfn_sb;
 	rc = nd_pfn_validate(nd_pfn);
-	if (rc == 0 || rc == -EBUSY)
+	if (rc == -ENODEV)
+		/* no info block, do init */;
+	else
 		return rc;
 
 	nd_region = to_nd_region(nd_pfn->dev.parent);