Skip to contentSkip to conversation

bnvdimm/namsepace: Don't set claim_class on error

PATCH Superseded [email protected] 3 participants 5 messages Sep 25, 2019 – Sep 26, 2019

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 drivers/nvdimm/namespace_devs.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/nvdimm/namespace_devs.c +9 -10
index 5b22cecefc99..a020c166e1e7 100644
@@ -1510,16 +1510,19 @@ 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 +1531,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 +1538,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 +1546,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
maintainer
#1 lore raw

T24gV2VkLCAyMDE5LTA5LTI1IGF0IDExOjEwIC0wNzAwLCBpcmEud2VpbnlAaW50ZWwuY29tIHdy b3RlOg0KPiBGcm9tOiBJcmEgV2VpbnkgPGlyYS53ZWlueUBpbnRlbC5jb20+DQo+IA0KPiBEb24n dCBsZWF2ZSBjbGFpbV9jbGFzcyBzZXQgdG8gYW4gaW52YWxpZCB2YWx1ZSBpZiBhbiBlcnJvciBv Y2N1cnMgaW4NCj4gYnR0X2NsYWltX2NsYXNzKCkuDQo+IA0KPiBXaGlsZSB3ZSBhcmUgaGVyZSBj aGFuZ2UgdGhlIHJldHVybiB0eXBlIG9mIF9faG9sZGVyX2NsYXNzX3N0b3JlKCkgdG8gYmUNCj4g Y2xlYXIgYWJvdXQgdGhlIHZhbHVlcyBpdCBpcyByZXR1cm5pbmcuDQo+IA0KPiBUaGlzIHdhcyBm b3VuZCB2aWEgY29kZSBpbnNwZWN0aW9uLg0KPiANCj4gU2lnbmVkLW9mZi1ieTogSXJhIFdlaW55 IDxpcmEud2VpbnlAaW50ZWwuY29tPg0KPiAtLS0NCj4gIGRyaXZlcnMvbnZkaW1tL25hbWVzcGFj ZV9kZXZzLmMgfCAxOSArKysrKysrKystLS0tLS0tLS0tDQo+ICAxIGZpbGUgY2hhbmdlZCwgOSBp bnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkNCg0KT25lIG1pbm9yIG5pdCBiZWxvdywgYnV0 IG90aGVyd2lzZSBpdCBsb29rcyBnb29kIHRvIG1lOg0KUmV2aWV3ZWQtYnk6IFZpc2hhbCBWZXJt YSA8dmlzaGFsLmwudmVybWFAaW50ZWwuY29tPg0KDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9udmRpbW0vbmFtZXNwYWNlX2RldnMuYyBiL2RyaXZlcnMvbnZkaW1tL25hbWVzcGFjZV9kZXZz LmMNCj4gaW5kZXggNWIyMmNlY2VmYzk5Li5hMDIwYzE2NmUxZTcgMTAwNjQ0DQo+IC0tLSBhL2Ry aXZlcnMvbnZkaW1tL25hbWVzcGFjZV9kZXZzLmMNCj4gKysrIGIvZHJpdmVycy9udmRpbW0vbmFt ZXNwYWNlX2RldnMuYw0KPiBAQCAtMTUxMCwxNiArMTUxMCwxOSBAQCBzdGF0aWMgc3NpemVfdCBo b2xkZXJfc2hvdyhzdHJ1Y3QgZGV2aWNlICpkZXYsDQo+ICB9DQo+ICBzdGF0aWMgREVWSUNFX0FU VFJfUk8oaG9sZGVyKTsNCj4gIA0KPiAtc3RhdGljIHNzaXplX3QgX19ob2xkZXJfY2xhc3Nfc3Rv cmUoc3RydWN0IGRldmljZSAqZGV2LCBjb25zdCBjaGFyICpidWYpDQo+ICtzdGF0aWMgaW50IF9f aG9sZGVyX2NsYXNzX3N0b3JlKHN0cnVjdCBkZXZpY2UgKmRldiwgY29uc3QgY2hhciAqYnVmKQ0K PiAgew0KPiAgCXN0cnVjdCBuZF9uYW1lc3BhY2VfY29tbW9uICpuZG5zID0gdG9fbmRucyhkZXYp Ow0KPiAgDQo+ICAJaWYgKGRldi0+ZHJpdmVyIHx8IG5kbnMtPmNsYWltKQ0KPiAgCQlyZXR1cm4g LUVCVVNZOw0KPiAgDQo+IC0JaWYgKHN5c2ZzX3N0cmVxKGJ1ZiwgImJ0dCIpKQ0KPiAtCQluZG5z LT5jbGFpbV9jbGFzcyA9IGJ0dF9jbGFpbV9jbGFzcyhkZXYpOw0KPiAtCWVsc2UgaWYgKHN5c2Zz X3N0cmVxKGJ1ZiwgInBmbiIpKQ0KPiArCWlmIChzeXNmc19zdHJlcShidWYsICJidHQiKSkgew0K PiArCQlpbnQgcmMgPSBidHRfY2xhaW1fY2xhc3MoZGV2KTsNCg0KTmVlZCBhIGJsYW5rIGxpbmUg aGVyZSBzZXBhcmF0aW5nIHZhcmlhYmxlIGRlY2xhcmF0aW9ucyBhbmQgY29kZS4NCg0KPiArCQlp ZiAocmMgPCBOVkRJTU1fQ0NMQVNTX05PTkUpDQo+ICsJCQlyZXR1cm4gcmM7DQo+ICsJCW5kbnMt PmNsYWltX2NsYXNzID0gcmM7DQo+ICsJfSBlbHNlIGlmIChzeXNmc19zdHJlcShidWYsICJwZm4i KSkNCj4gIAkJbmRucy0+Y2xhaW1fY2xhc3MgPSBOVkRJTU1fQ0NMQVNTX1BGTjsNCj4gIAllbHNl IGlmIChzeXNmc19zdHJlcShidWYsICJkYXgiKSkNCj4gIAkJbmRucy0+Y2xhaW1fY2xhc3MgPSBO VkRJTU1fQ0NMQVNTX0RBWDsNCj4gQEAgLTE1MjgsMTAgKzE1MzEsNiBAQCBzdGF0aWMgc3NpemVf dCBfX2hvbGRlcl9jbGFzc19zdG9yZShzdHJ1Y3QgZGV2aWNlICpkZXYsIGNvbnN0IGNoYXIgKmJ1 ZikNCj4gIAllbHNlDQo+ICAJCXJldHVybiAtRUlOVkFMOw0KPiAgDQo+IC0JLyogYnR0X2NsYWlt X2NsYXNzKCkgY291bGQndmUgcmV0dXJuZWQgYW4gZXJyb3IgKi8NCj4gLQlpZiAoKGludCluZG5z LT5jbGFpbV9jbGFzcyA8IDApDQo+IC0JCXJldHVybiBuZG5zLT5jbGFpbV9jbGFzczsNCj4gLQ0K PiAgCXJldHVybiAwOw0KPiAgfQ0KPiAgDQo+IEBAIC0xNTM5LDcgKzE1MzgsNyBAQCBzdGF0aWMg c3NpemVfdCBob2xkZXJfY2xhc3Nfc3RvcmUoc3RydWN0IGRldmljZSAqZGV2LA0KPiAgCQlzdHJ1 Y3QgZGV2aWNlX2F0dHJpYnV0ZSAqYXR0ciwgY29uc3QgY2hhciAqYnVmLCBzaXplX3QgbGVuKQ0K PiAgew0KPiAgCXN0cnVjdCBuZF9yZWdpb24gKm5kX3JlZ2lvbiA9IHRvX25kX3JlZ2lvbihkZXYt PnBhcmVudCk7DQo+IC0Jc3NpemVfdCByYzsNCj4gKwlpbnQgcmM7DQo+ICANCj4gIAluZF9kZXZp Y2VfbG9jayhkZXYpOw0KPiAgCW52ZGltbV9idXNfbG9jayhkZXYpOw0KPiBAQCAtMTU0Nyw3ICsx NTQ2LDcgQEAgc3RhdGljIHNzaXplX3QgaG9sZGVyX2NsYXNzX3N0b3JlKHN0cnVjdCBkZXZpY2Ug KmRldiwNCj4gIAlyYyA9IF9faG9sZGVyX2NsYXNzX3N0b3JlKGRldiwgYnVmKTsNCj4gIAlpZiAo cmMgPj0gMCkNCj4gIAkJcmMgPSBuZF9uYW1lc3BhY2VfbGFiZWxfdXBkYXRlKG5kX3JlZ2lvbiwg ZGV2KTsNCj4gLQlkZXZfZGJnKGRldiwgIiVzKCV6ZClcbiIsIHJjIDwgMCA/ICJmYWlsICIgOiAi IiwgcmMpOw0KPiArCWRldl9kYmcoZGV2LCAiJXMoJWQpXG4iLCByYyA8IDAgPyAiZmFpbCAiIDog IiIsIHJjKTsNCj4gIAludmRpbW1fYnVzX3VubG9jayhkZXYpOw0KPiAgCW5kX2RldmljZV91bmxv Y2soZGV2KTsNCj4gIA0KDQo

author
#2 lore raw
Quoted 8 lines
Quoted 5 lines
---
 drivers/nvdimm/namespace_devs.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

One minor nit below, but otherwise it looks good to me:

Thanks...

Quoted 18 lines
Quoted 18 lines
drivers/nvdimm/namespace_devs.c +1 -1
index 5b22cecefc99..a020c166e1e7 100644
@@ -1510,16 +1510,19 @@ 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;
 
Quoted 7 lines

drivers/nvdimm/namespace_devs.c static ssize_t holder_show(struct device *dev, · line 1521

Quoted 5 lines
drivers/nvdimm/namespace_devs.c +2 -3
-	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);

Need a blank line here separating variable declarations and code.

<sigh> yea I know better... ;-)

V2 sent...

Thanks,
Ira

#3 lore raw
Quoted 8 lines · Ira Weiny
Quoted 8 lines
Quoted 5 lines
---
 drivers/nvdimm/namespace_devs.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

One minor nit below, but otherwise it looks good to me:

Another minor nit, the Subject says:
"bnvdimm/namsepace: Don't set claim_class on error"

a.k.a missing the 'li' part of libnvdimm

Signature · 8 lines
Johannes Thumshirn                            SUSE Labs Filesystems
[email protected]                                +49 911 74053 689
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5
90409 Nürnberg
Germany
(HRB 247165, AG München)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
author
#4 lore raw

PiBPbiAyNS8wOS8yMDE5IDIwOjQ5LCBJcmEgV2Vpbnkgd3JvdGU6DQo+ID4+Pg0KPiA+Pj4gU2ln bmVkLW9mZi1ieTogSXJhIFdlaW55IDxpcmEud2VpbnlAaW50ZWwuY29tPg0KPiA+Pj4gLS0tDQo+ ID4+PiAgZHJpdmVycy9udmRpbW0vbmFtZXNwYWNlX2RldnMuYyB8IDE5ICsrKysrKysrKy0tLS0t LS0tLS0NCj4gPj4+ICAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlv bnMoLSkNCj4gPj4NCj4gPj4gT25lIG1pbm9yIG5pdCBiZWxvdywgYnV0IG90aGVyd2lzZSBpdCBs b29rcyBnb29kIHRvIG1lOg0KPiA+PiBSZXZpZXdlZC1ieTogVmlzaGFsIFZlcm1hIDx2aXNoYWwu bC52ZXJtYUBpbnRlbC5jb20+DQo+IA0KPiBBbm90aGVyIG1pbm9yIG5pdCwgdGhlIFN1YmplY3Qg c2F5czoNCj4gImJudmRpbW0vbmFtc2VwYWNlOiBEb24ndCBzZXQgY2xhaW1fY2xhc3Mgb24gZXJy b3IiDQo+IA0KPiBhLmsuYSBtaXNzaW5nIHRoZSAnbGknIHBhcnQgb2YgbGlibnZkaW1tDQoNClll YS4uLiAgSSB3YXMganVzdCBydXNoaW5nLiAgVjMgaGFzIHRoaXMgZml4Lg0KDQpUaGFua3MsDQpJ cmENCg0KPiANCj4gLS0NCj4gSm9oYW5uZXMgVGh1bXNoaXJuICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFNVU0UgTGFicyBGaWxlc3lzdGVtcw0KPiBqdGh1bXNoaXJuQHN1c2UuZGUgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICs0OSA5MTEgNzQwNTMgNjg5DQo+IFNVU0UgU29mdHdh cmUgU29sdXRpb25zIEdlcm1hbnkgR21iSA0KPiBNYXhmZWxkc3RyLiA1DQo+IDkwNDA5IE7DvHJu YmVyZw0KPiBHZXJtYW55DQo+IChIUkIgMjQ3MTY1LCBBRyBNw7xuY2hlbikNCj4gS2V5IGZpbmdl cnByaW50ID0gRUMzOCA5Q0FCIEMyQzQgRjI1RCA4NjAwIEQwRDAgMDM5MyA5NjlEIDJENzYgMDg1 MA0K