2022-06-08 03:39:04

by Thomas Weißschuh

Subject: [PATCH] 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")
Signed-off-by: Thomas Weißschuh <[email protected]>
---
drivers/nvme/host/core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 24165daee3c8..189bbd6c0c29 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -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
--
2.36.1

2022-06-13 20:06:35

by Christoph Hellwig

Subject: Re: [PATCH] nvme: add device name to warning in uuid_show()

Thanks,

applied to nvme-5.19 with the small whitespace fixup.