summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Weißschuh <linux@weissschuh.net>2022-06-07 17:55:55 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-22 14:13:17 +0200
commitb90ae84a8a9cd57a6e773dd640748904588977fe (patch)
treedfd09ff19dfc07530c367bc8a26d069fd4bd842e
parent42f7cbe2c2c98c05f29c3a64983ed1d216e3cf84 (diff)
downloadlinux-stable-b90ae84a8a9cd57a6e773dd640748904588977fe.tar.gz
linux-stable-b90ae84a8a9cd57a6e773dd640748904588977fe.tar.bz2
linux-stable-b90ae84a8a9cd57a6e773dd640748904588977fe.zip
nvme: add device name to warning in uuid_show()
[ Upstream commit 1fc766b5c08417248e0008bca14c3572ac0f1c26 ] 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 <linux@weissschuh.net> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/nvme/host/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c8c8c567a000..0aa68da51ed7 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3372,8 +3372,8 @@ 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);