|
@@ -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);
|
|
struct nvme_ns *ns = nvme_get_ns_from_dev(dev);
|
|
|
|
|
|
if (a == &dev_attr_uuid.attr) {
|
|
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)))
|
|
!memchr_inv(ns->nguid, 0, sizeof(ns->nguid)))
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|