diff mbox

[1/3] hpsa: convert show method snprintf usage to scnprintf

Message ID DDB9C85B850785449757F9914A034FCB4442E184@G9W0766.americas.hpqcorp.net (mailing list archive)
State New, archived
Headers show

Commit Message

Seymour, Shane M July 1, 2015, 3:45 a.m. UTC 
Changed all show method snprintf usage to scnprintf per
Documentation/filesystems/sysfs.txt.

Signed-off-by: Shane Seymour <shane.seymour@hp.com>
---
Please let me know if this is not the correct way to submit
patches by separating them but keeping them logically
together.
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

James Bottomley Aug. 26, 2015, 2:05 p.m. UTC | #1 
On Wed, 2015-07-01 at 03:45 +0000, Seymour, Shane M wrote:
> Changed all show method snprintf usage to scnprintf per
> Documentation/filesystems/sysfs.txt.
> 
> Signed-off-by: Shane Seymour <shane.seymour@hp.com>

There's been no ack on this one.  However, there's no actual reason to
prefer scnprintf over snprintf: the former will zero terminate, the
latter won't if the write length is over the buffer length, but this is
a file buffer: the routine will return as many bytes to userspace as are
specified in the count (including zeros if they're within the count), so
zero termination of a string in sysfs is unnecessary.

James


> Please let me know if this is not the correct way to submit
> patches by separating them but keeping them logically
> together.
> --- a/drivers/scsi/hpsa.c	2015-06-25 15:52:15.633031319 -0500
> +++ b/drivers/scsi/hpsa.c	2015-06-30 16:12:58.125990687 -0500
> @@ -460,7 +460,7 @@ static ssize_t host_show_firmware_revisi
>  	if (!h->hba_inquiry_data)
>  		return 0;
>  	fwrev = &h->hba_inquiry_data[32];
> -	return snprintf(buf, 20, "%c%c%c%c\n",
> +	return scnprintf(buf, 20, "%c%c%c%c\n",
>  		fwrev[0], fwrev[1], fwrev[2], fwrev[3]);
>  }
>  
> @@ -470,7 +470,7 @@ static ssize_t host_show_commands_outsta
>  	struct Scsi_Host *shost = class_to_shost(dev);
>  	struct ctlr_info *h = shost_to_hba(shost);
>  
> -	return snprintf(buf, 20, "%d\n",
> +	return scnprintf(buf, 20, "%d\n",
>  			atomic_read(&h->commands_outstanding));
>  }
>  
> @@ -481,7 +481,7 @@ static ssize_t host_show_transport_mode(
>  	struct Scsi_Host *shost = class_to_shost(dev);
>  
>  	h = shost_to_hba(shost);
> -	return snprintf(buf, 20, "%s\n",
> +	return scnprintf(buf, 20, "%s\n",
>  		h->transMethod & CFGTBL_Trans_Performant ?
>  			"performant" : "simple");
>  }
> @@ -493,7 +493,7 @@ static ssize_t host_show_hp_ssd_smart_pa
>  	struct Scsi_Host *shost = class_to_shost(dev);
>  
>  	h = shost_to_hba(shost);
> -	return snprintf(buf, 30, "HP SSD Smart Path %s\n",
> +	return scnprintf(buf, 30, "HP SSD Smart Path %s\n",
>  		(h->acciopath_status == 1) ?  "enabled" : "disabled");
>  }
>  
> @@ -589,7 +589,7 @@ static ssize_t host_show_resettable(stru
>  	struct Scsi_Host *shost = class_to_shost(dev);
>  
>  	h = shost_to_hba(shost);
> -	return snprintf(buf, 20, "%d\n", ctlr_is_resettable(h->board_id));
> +	return scnprintf(buf, 20, "%d\n", ctlr_is_resettable(h->board_id));
>  }
>  
>  static inline int is_logical_dev_addr_mode(unsigned char scsi3addr[])
> @@ -631,7 +631,7 @@ static ssize_t raid_level_show(struct de
>  	/* Is this even a logical drive? */
>  	if (!is_logical_dev_addr_mode(hdev->scsi3addr)) {
>  		spin_unlock_irqrestore(&h->lock, flags);
> -		l = snprintf(buf, PAGE_SIZE, "N/A\n");
> +		l = scnprintf(buf, PAGE_SIZE, "N/A\n");
>  		return l;
>  	}
>  
> @@ -639,7 +639,7 @@ static ssize_t raid_level_show(struct de
>  	spin_unlock_irqrestore(&h->lock, flags);
>  	if (rlevel > RAID_UNKNOWN)
>  		rlevel = RAID_UNKNOWN;
> -	l = snprintf(buf, PAGE_SIZE, "RAID %s\n", raid_label[rlevel]);
> +	l = scnprintf(buf, PAGE_SIZE, "RAID %s\n", raid_label[rlevel]);
>  	return l;
>  }
>  
> @@ -662,7 +662,7 @@ static ssize_t lunid_show(struct device
>  	}
>  	memcpy(lunid, hdev->scsi3addr, sizeof(lunid));
>  	spin_unlock_irqrestore(&h->lock, flags);
> -	return snprintf(buf, 20, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",
> +	return scnprintf(buf, 20, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",
>  		lunid[0], lunid[1], lunid[2], lunid[3],
>  		lunid[4], lunid[5], lunid[6], lunid[7]);
>  }
> @@ -686,7 +686,7 @@ static ssize_t unique_id_show(struct dev
>  	}
>  	memcpy(sn, hdev->device_id, sizeof(sn));
>  	spin_unlock_irqrestore(&h->lock, flags);
> -	return snprintf(buf, 16 * 2 + 2,
> +	return scnprintf(buf, 16 * 2 + 2,
>  			"%02X%02X%02X%02X%02X%02X%02X%02X"
>  			"%02X%02X%02X%02X%02X%02X%02X%02X\n",
>  			sn[0], sn[1], sn[2], sn[3],
> @@ -714,7 +714,7 @@ static ssize_t host_show_hp_ssd_smart_pa
>  	}
>  	offload_enabled = hdev->offload_enabled;
>  	spin_unlock_irqrestore(&h->lock, flags);
> -	return snprintf(buf, 20, "%d\n", offload_enabled);
> +	return scnprintf(buf, 20, "%d\n", offload_enabled);
>  }
>  
>  static DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 



--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Seymour, Shane M Aug. 27, 2015, 6:56 a.m. UTC | #2 
SGkgSmFtZXMsDQoNCj4gVGhlcmUncyBiZWVuIG5vIGFjayBvbiB0aGlzIG9uZS4gIEhvd2V2ZXIs
IHRoZXJlJ3Mgbm8gYWN0dWFsIHJlYXNvbiB0bw0KPiBwcmVmZXIgc2NucHJpbnRmIG92ZXIgc25w
cmludGY6IHRoZSBmb3JtZXIgd2lsbCB6ZXJvIHRlcm1pbmF0ZSwgdGhlDQo+IGxhdHRlciB3b24n
dCBpZiB0aGUgd3JpdGUgbGVuZ3RoIGlzIG92ZXIgdGhlIGJ1ZmZlciBsZW5ndGgsIGJ1dCB0aGlz
IGlzDQo+IGEgZmlsZSBidWZmZXI6IHRoZSByb3V0aW5lIHdpbGwgcmV0dXJuIGFzIG1hbnkgYnl0
ZXMgdG8gdXNlcnNwYWNlIGFzIGFyZQ0KPiBzcGVjaWZpZWQgaW4gdGhlIGNvdW50IChpbmNsdWRp
bmcgemVyb3MgaWYgdGhleSdyZSB3aXRoaW4gdGhlIGNvdW50KSwgc28NCj4gemVybyB0ZXJtaW5h
dGlvbiBvZiBhIHN0cmluZyBpbiBzeXNmcyBpcyB1bm5lY2Vzc2FyeS4NCg0KVGhlcmUncyBhIHBh
dGNoIGluIEdyZWcncyBkcml2ZXIgdHJlZSBmb3IgdGhlIG5leHQgbWVyZ2UgdGhhdCBjaGFuZ2Vz
DQp0aGUgZG9jdW1lbnRhdGlvbiBhYm91dCB0aGUgdXNhZ2Ugb2YgdGhlIHMqcHJpbnRmKCkgZnVu
Y3Rpb25zIGluIHN5c2ZzDQpzaG93KCkgbWV0aG9kcyBmcm9tL3RvIChpbiBEb2N1bWVudGF0aW9u
L2ZpbGVzeXN0ZW1zL3N5c2ZzLnR4dCk6DQoNCi0tIHNob3coKSBzaG91bGQgYWx3YXlzIHVzZSBz
Y25wcmludGYoKS4NCistIHNob3coKSBtdXN0IG5vdCB1c2Ugc25wcmludGYoKSB3aGVuIGZvcm1h
dHRpbmcgdGhlIHZhbHVlIHRvIGJlDQorICByZXR1cm5lZCB0byB1c2VyIHNwYWNlLiBJZiB5b3Ug
Y2FuIGd1YXJhbnRlZSB0aGF0IGFuIG92ZXJmbG93DQorICB3aWxsIG5ldmVyIGhhcHBlbiB5b3Ug
Y2FuIHVzZSBzcHJpbnRmKCkgb3RoZXJ3aXNlIHlvdSBtdXN0IHVzZQ0KKyAgc2NucHJpbnRmKCku
DQoNCkl0IGN1cnJlbnRseSBzYXlzIHlvdSBzaG91bGQgdXNlIHNjbnByaW50ZigpIGJ1dCB3aWxs
IGJlY29tZSBtb3JlDQpleHBsaWNpdCBhYm91dCB3aGF0IHlvdSBtdXN0IG5vdCB1c2UgYW5kIHdo
YXQgeW91IGNhbiBvciBtdXN0IHVzZS4NClRoYXQncyBwcm9iYWJseSB0aGUgYmVzdCByZWFzb24g
SSBjYW4gb2ZmZXIgYWJvdXQgd2h5IHRvIHByZWZlciBvbmUNCmZ1bmN0aW9uIG92ZXIgdGhlIG90
aGVyLg0KDQpUaGlzIGlzIG15IHVuZGVyc3RhbmRpbmcgb2YgdGhlIGRpZmZlcmVuY2UgYmV0d2Vl
biBzbnByaW50ZigpIGFuZA0Kc2NucHJpbnRmKCkgaW4gdGVybXMgb2Ygc3lzZnMgc2hvdygpIG1l
dGhvZHMgLSB0aGVyZSBpcyBhIHN1YnRsZQ0KZGlmZmVyZW5jZSBiZXR3ZWVuIHRoZSB0d28gZnVu
Y3Rpb25zIGluIHRoZSByZXR1cm4gdmFsdWUuDQoNClRoZSBzbnByaW50ZigpIGZ1bmN0aW9uIHJl
dHVybnMgdGhlIG51bWJlciBvZiBieXRlcyB0aGF0IGl0IHdvdWxkDQpoYXZlIGZvcm1hdHRlZCBn
aXZlbiBzdWZmaWNpZW50IHNwYWNlLiBJdCBkb2Vzbid0IG1hdHRlciB3aGF0IHRoZQ0Kc2l6ZSBh
cmd1bWVudCB3YXMuIElmIHRoZSBzaXplIHBhc3NlZCBpbiBpcyA0MDk2IGFuZCB0aGUgbnVtYmVy
IG9mDQpieXRlcyB0aGF0IGl0IHdvdWxkIGhhdmUgZm9ybWF0dGVkIGlzIDQyMDAgdGhlbiA0MjAw
IHdpbGwgYmUgd2hhdCBpcw0KcmV0dXJuZWQgZnJvbSBzbnByaW50ZigpIGV2ZW4gdGhvdWdoIGl0
IGRpZCBub3QgbW9kaWZ5IGFueXRoaW5nDQphZnRlciBieXRlIDQwOTYgaW4gdGhlIGJ1ZmZlci4N
Cg0KVGhlIHNjbnByaW50ZigpIGZ1bmN0aW9uIHJldHVybnMgdGhlIG51bWJlciBvZiBieXRlcyBp
dCBhY3R1YWxseQ0KZm9ybWF0dGVkIChleGNsdWRpbmcgdGhlIHplcm8gdGVybWluYXRpb24pLiBV
c2luZyB0aGUgYWJvdmUgZGF0YQ0KaWYgNDA5NiB3YXMgdGhlIHNpemUgcGFzc2VkIGluIHRoZW4g
dGhlIHJldHVybiB2YWx1ZSB3aWxsIG5ldmVyIGJlDQptb3JlIHRoYW4gNDA5NS4NCg0KVGhlcmUg
aXMgY29kZSBpbiBzeXNmc19rZl9zZXFfc2hvdygpIHRvIG1ha2Ugc3VyZSB0aGF0IHRoZSBjb3Vu
dA0KcmV0dXJuZWQgZnJvbSB0aGUgc2hvdygpIG1ldGhvZCBpcyBub3QgPj0gUEFHRV9TSVpFIGFu
ZA0KcmVkdWNlIGl0IHRvIFBBR0VfU0laRS0xIGlmIGl0IHdhcy4gSSBkb24ndCB0aGluayB1c2Vy
IHNwYWNlIHdpbGwgDQpldmVyIGdldCBtb3JlIHRoYW4gUEFHRV9TSVpFLTEgYnl0ZXMgcmVnYXJk
bGVzcyBvZiB3aGljaA0KZnVuY3Rpb24gaXMgdXNlZC4NCg0KSSBkb24ndCBtaW5kIGlmIHRoZSBw
YXRjaCBpc24ndCBhY2NlcHRlZCBidXQgSSB0aG91Z2h0IEkgc2hvdWxkIGF0DQpsZWFzdCBleHBs
YWluIG15IHJhdGlvbmFsZSBiZWhpbmQgdGhlIGNoYW5nZS4NCg0KVGhhbmtzDQpTaGFuZQ0K
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- a/drivers/scsi/hpsa.c	2015-06-25 15:52:15.633031319 -0500
+++ b/drivers/scsi/hpsa.c	2015-06-30 16:12:58.125990687 -0500
@@ -460,7 +460,7 @@  static ssize_t host_show_firmware_revisi
 	if (!h->hba_inquiry_data)
 		return 0;
 	fwrev = &h->hba_inquiry_data[32];
-	return snprintf(buf, 20, "%c%c%c%c\n",
+	return scnprintf(buf, 20, "%c%c%c%c\n",
 		fwrev[0], fwrev[1], fwrev[2], fwrev[3]);
 }
 
@@ -470,7 +470,7 @@  static ssize_t host_show_commands_outsta
 	struct Scsi_Host *shost = class_to_shost(dev);
 	struct ctlr_info *h = shost_to_hba(shost);
 
-	return snprintf(buf, 20, "%d\n",
+	return scnprintf(buf, 20, "%d\n",
 			atomic_read(&h->commands_outstanding));
 }
 
@@ -481,7 +481,7 @@  static ssize_t host_show_transport_mode(
 	struct Scsi_Host *shost = class_to_shost(dev);
 
 	h = shost_to_hba(shost);
-	return snprintf(buf, 20, "%s\n",
+	return scnprintf(buf, 20, "%s\n",
 		h->transMethod & CFGTBL_Trans_Performant ?
 			"performant" : "simple");
 }
@@ -493,7 +493,7 @@  static ssize_t host_show_hp_ssd_smart_pa
 	struct Scsi_Host *shost = class_to_shost(dev);
 
 	h = shost_to_hba(shost);
-	return snprintf(buf, 30, "HP SSD Smart Path %s\n",
+	return scnprintf(buf, 30, "HP SSD Smart Path %s\n",
 		(h->acciopath_status == 1) ?  "enabled" : "disabled");
 }
 
@@ -589,7 +589,7 @@  static ssize_t host_show_resettable(stru
 	struct Scsi_Host *shost = class_to_shost(dev);
 
 	h = shost_to_hba(shost);
-	return snprintf(buf, 20, "%d\n", ctlr_is_resettable(h->board_id));
+	return scnprintf(buf, 20, "%d\n", ctlr_is_resettable(h->board_id));
 }
 
 static inline int is_logical_dev_addr_mode(unsigned char scsi3addr[])
@@ -631,7 +631,7 @@  static ssize_t raid_level_show(struct de
 	/* Is this even a logical drive? */
 	if (!is_logical_dev_addr_mode(hdev->scsi3addr)) {
 		spin_unlock_irqrestore(&h->lock, flags);
-		l = snprintf(buf, PAGE_SIZE, "N/A\n");
+		l = scnprintf(buf, PAGE_SIZE, "N/A\n");
 		return l;
 	}
 
@@ -639,7 +639,7 @@  static ssize_t raid_level_show(struct de
 	spin_unlock_irqrestore(&h->lock, flags);
 	if (rlevel > RAID_UNKNOWN)
 		rlevel = RAID_UNKNOWN;
-	l = snprintf(buf, PAGE_SIZE, "RAID %s\n", raid_label[rlevel]);
+	l = scnprintf(buf, PAGE_SIZE, "RAID %s\n", raid_label[rlevel]);
 	return l;
 }
 
@@ -662,7 +662,7 @@  static ssize_t lunid_show(struct device
 	}
 	memcpy(lunid, hdev->scsi3addr, sizeof(lunid));
 	spin_unlock_irqrestore(&h->lock, flags);
-	return snprintf(buf, 20, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",
+	return scnprintf(buf, 20, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",
 		lunid[0], lunid[1], lunid[2], lunid[3],
 		lunid[4], lunid[5], lunid[6], lunid[7]);
 }
@@ -686,7 +686,7 @@  static ssize_t unique_id_show(struct dev
 	}
 	memcpy(sn, hdev->device_id, sizeof(sn));
 	spin_unlock_irqrestore(&h->lock, flags);
-	return snprintf(buf, 16 * 2 + 2,
+	return scnprintf(buf, 16 * 2 + 2,
 			"%02X%02X%02X%02X%02X%02X%02X%02X"
 			"%02X%02X%02X%02X%02X%02X%02X%02X\n",
 			sn[0], sn[1], sn[2], sn[3],
@@ -714,7 +714,7 @@  static ssize_t host_show_hp_ssd_smart_pa
 	}
 	offload_enabled = hdev->offload_enabled;
 	spin_unlock_irqrestore(&h->lock, flags);
-	return snprintf(buf, 20, "%d\n", offload_enabled);
+	return scnprintf(buf, 20, "%d\n", offload_enabled);
 }
 
 static DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL);