Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 007a61ae authored by Martin Wilck's avatar Martin Wilck Committed by Christoph Hellwig
Browse files

nvme: fix visibility of "uuid" ns attribute 



"uuid" must be invisible if both ns->uuid and ns->nguid are unset,
not if either one is.

Fixes: d934f984 "nvme: provide UUID value to userspace"
Signed-off-by: default avatarMartin Wilck <mwilck@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a5f3d8a5

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2136,7 +2136,7 @@ static umode_t nvme_ns_attrs_are_visible(struct kobject *kobj, 
	struct nvme_ns *ns = nvme_get_ns_from_dev(dev);



	if (a == &dev_attr_uuid.attr) {

		if (uuid_is_null(&ns->uuid) ||

		if (uuid_is_null(&ns->uuid) &&

		    !memchr_inv(ns->nguid, 0, sizeof(ns->nguid)))

			return 0;

	}