Skip to contentSkip to conversation

bnvdimm/namsepace: Don't set claim_class on error

PATCH Superseded [email protected] 2 participants 3 messages Sep 25, 2019

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 bnvdimm/namsepace: Don't set claim_class on error

From: Ira Weiny <[email protected]>

Don't leave claim_class set to an invalid value if an error occurs in btt_claim_class().

While we are here change the return type of __holder_class_store() to be clear about the values it is returning.

This was found via code inspection.

---
V1->V2
Add space after variable declaration...

 drivers/nvdimm/namespace_devs.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/nvdimm/namespace_devs.c +10 -10
index 5b22cecefc99..eef885c59f47 100644
@@ -1510,16 +1510,20 @@ static ssize_t holder_show(struct device *dev,
 }
 static DEVICE_ATTR_RO(holder);
 
-static ssize_t __holder_class_store(struct device *dev, const char *buf)
+static int __holder_class_store(struct device *dev, const char *buf)
 {
 	struct nd_namespace_common *ndns = to_ndns(dev);
 
 	if (dev->driver || ndns->claim)
 		return -EBUSY;
 
-	if (sysfs_streq(buf, "btt"))
-		ndns->claim_class = btt_claim_class(dev);
-	else if (sysfs_streq(buf, "pfn"))
+	if (sysfs_streq(buf, "btt")) {
+		int rc = btt_claim_class(dev);
+
+		if (rc < NVDIMM_CCLASS_NONE)
+			return rc;
+		ndns->claim_class = rc;
+	} else if (sysfs_streq(buf, "pfn"))
 		ndns->claim_class = NVDIMM_CCLASS_PFN;
 	else if (sysfs_streq(buf, "dax"))
 		ndns->claim_class = NVDIMM_CCLASS_DAX;
@@ -1528,10 +1532,6 @@ static ssize_t __holder_class_store(struct device *dev, const char *buf)
 	else
 		return -EINVAL;
 
-	/* btt_claim_class() could've returned an error */
-	if ((int)ndns->claim_class < 0)
-		return ndns->claim_class;
-
 	return 0;
 }
 
@@ -1539,7 +1539,7 @@ static ssize_t holder_class_store(struct device *dev,
 		struct device_attribute *attr, const char *buf, size_t len)
 {
 	struct nd_region *nd_region = to_nd_region(dev->parent);
-	ssize_t rc;
+	int rc;
 
 	nd_device_lock(dev);
 	nvdimm_bus_lock(dev);
@@ -1547,7 +1547,7 @@ static ssize_t holder_class_store(struct device *dev,
 	rc = __holder_class_store(dev, buf);
 	if (rc >= 0)
 		rc = nd_namespace_label_update(nd_region, dev);
-	dev_dbg(dev, "%s(%zd)\n", rc < 0 ? "fail " : "", rc);
+	dev_dbg(dev, "%s(%d)\n", rc < 0 ? "fail " : "", rc);
 	nvdimm_bus_unlock(dev);
 	nd_device_unlock(dev);
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 9 lines · On Wed, Sep 25, 2019 at 11:49 AM <[email protected]> wrote:

From: Ira Weiny <[email protected]>

Don't leave claim_class set to an invalid value if an error occurs in btt_claim_class().

While we are here change the return type of __holder_class_store() to be clear about the values it is returning.

Quoted 8 lines

This was found via code inspection.

---
V1->V2
Add space after variable declaration...

Oh, was also hoping this would address s/bnvdimm/libnvdimm/ in the patch subject.

Note, kernel-janitors is for minor spelling fixes and trivial changes with no runtime side-effects that might otherwise fall through the cracks. This has functional implications so is not a janitorial change.

One more comment below...

Quoted 34 lines
 drivers/nvdimm/namespace_devs.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/nvdimm/namespace_devs.c +8 -4
index 5b22cecefc99..eef885c59f47 100644
@@ -1510,16 +1510,20 @@ static ssize_t holder_show(struct device *dev,
 }
 static DEVICE_ATTR_RO(holder);
 
-static ssize_t __holder_class_store(struct device *dev, const char *buf)
+static int __holder_class_store(struct device *dev, const char *buf)
 {
        struct nd_namespace_common *ndns = to_ndns(dev);
 
        if (dev->driver || ndns->claim)
                return -EBUSY;
 
-       if (sysfs_streq(buf, "btt"))
-               ndns->claim_class = btt_claim_class(dev);
-       else if (sysfs_streq(buf, "pfn"))
+       if (sysfs_streq(buf, "btt")) {
+               int rc = btt_claim_class(dev);
+
+               if (rc < NVDIMM_CCLASS_NONE)
+                       return rc;
+               ndns->claim_class = rc;
+       } else if (sysfs_streq(buf, "pfn"))
                ndns->claim_class = NVDIMM_CCLASS_PFN;
        else if (sysfs_streq(buf, "dax"))
                ndns->claim_class = NVDIMM_CCLASS_DAX;

drivers/nvdimm/namespace_devs.c static ssize_t __holder_class_store(struct device *dev, const char *buf) · line 1534

Quoted 7 lines
drivers/nvdimm/namespace_devs.c +0 -4
@@ -1528,10 +1532,6 @@ static ssize_t __holder_class_store(struct device *dev, const char *buf)
        else
                return -EINVAL;
 
-       /* btt_claim_class() could've returned an error */
-       if ((int)ndns->claim_class < 0)
-               return ndns->claim_class;
-

Since this effectively replaces Dan's patch can you respin without that baseline, and just give Dan credit with a Reported-by?

Quoted 24 lines
drivers/nvdimm/namespace_devs.c +2 -3
        return 0;
 }
 
@@ -1539,7 +1539,7 @@ static ssize_t holder_class_store(struct device *dev,
                struct device_attribute *attr, const char *buf, size_t len)
 {
        struct nd_region *nd_region = to_nd_region(dev->parent);
-       ssize_t rc;
+       int rc;
 
        nd_device_lock(dev);
        nvdimm_bus_lock(dev);
@@ -1547,7 +1547,7 @@ static ssize_t holder_class_store(struct device *dev,
        rc = __holder_class_store(dev, buf);
        if (rc >= 0)
                rc = nd_namespace_label_update(nd_region, dev);
-       dev_dbg(dev, "%s(%zd)\n", rc < 0 ? "fail " : "", rc);
+       dev_dbg(dev, "%s(%d)\n", rc < 0 ? "fail " : "", rc);
        nvdimm_bus_unlock(dev);
        nd_device_unlock(dev);
 
--

2.20.1

author
#2 lore raw
Quoted 2 lines · Dan Williams
Quoted 1 line · On Wed, Sep 25, 2019 at 11:49 AM <[email protected]> wrote:

[snip]

Quoted 7 lines
Quoted 4 lines

---
V1->V2
Add space after variable declaration...

Oh, was also hoping this would address s/bnvdimm/libnvdimm/ in the patch subject.

Yea...

Quoted 5 lines

Note, kernel-janitors is for minor spelling fixes and trivial changes with no runtime side-effects that might otherwise fall through the cracks. This has functional implications so is not a janitorial change.

Ah yea I just thought it was ok to let that list know what was going on... I've removed them from V3. Sorry.

Quoted 3 lines

One more comment below...

[snip]

Quoted 4 lines
Quoted 1 line

-

Since this effectively replaces Dan's patch can you respin without that baseline, and just give Dan credit with a Reported-by?

V3 sent.

Ira