Skip to contentSkip to conversation

nvme: add device name to warning in uuid_show()

PATCH Applied Thomas Weißschuh 3 participants 4 messages Jun 7, 2022 – Jun 13, 2022 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: add device name to warning in uuid_show()

This provides more context to users.

Old message:

[   00.000000] No UUID available providing old NGUID

New message:

[   00.000000] block nvme0n1: No UUID available providing old NGUID
Fixes d934f9848a77 ("nvme: provide UUID value to userspace")
---
 drivers/nvme/host/core.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/nvme/host/core.c +1 -2
index 24165daee3c8..189bbd6c0c29 100644
@@ -3285,8 +3285,7 @@ static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,
 	 * we have no UUID set
 	 */
 	if (uuid_is_null(&ids->uuid)) {
-		printk_ratelimited(KERN_WARNING
-				   "No UUID available providing old NGUID\n");
+		dev_warn_ratelimited(dev, "No UUID available providing old NGUID\n");
 		return sysfs_emit(buf, "%pU\n", ids->nguid);
 	}
 	return sysfs_emit(buf, "%pU\n", &ids->uuid);

base-commit: e71e60cd74df9386c3f684c54888f2367050b831

Signature · 1 line
2.36.1
maintainer
#1 lore raw

drivers/nvme/host/core.c static ssize_t uuid_show(struct device *dev, struct device_attribute *attr, · line 3289

Quoted 5 lines · Thomas Weißschuh
drivers/nvme/host/core.c +1 -2
 	if (uuid_is_null(&ids->uuid)) {
-		printk_ratelimited(KERN_WARNING
-				   "No UUID available providing old NGUID\n");
+		dev_warn_ratelimited(dev, "No UUID available providing old NGUID\n");
 		return sysfs_emit(buf, "%pU\n", ids->nguid);

The line split was correct to prevent this overly long line. But otherwise, this looks good, though I'm wondering why this needs to be printed every time someone reads the attribute.

#2 lore raw
Quoted 10 lines · Keith Busch

drivers/nvme/host/core.c static ssize_t uuid_show(struct device *dev, struct device_attribute *attr, · line 3289

Quoted 5 lines · Thomas Weißschuh
drivers/nvme/host/core.c +1 -2
 	if (uuid_is_null(&ids->uuid)) {
-		printk_ratelimited(KERN_WARNING
-				   "No UUID available providing old NGUID\n");
+		dev_warn_ratelimited(dev, "No UUID available providing old NGUID\n");
 		return sysfs_emit(buf, "%pU\n", ids->nguid);

The line split was correct to prevent this overly long line. But otherwise, this looks good, though I'm wondering why this needs to be printed every time someone reads the attribute.

Sorry about the long line, thought it looks nicer on one line and other (similar) lines in the file are also using up to 100 characters per line. Do you want me to resend it?

No idea why has to be printed every time. A dev_warn_once() would be less spammy.