diff options
| author | Martin Wilck <mwilck@suse.com> | 2017-09-28 21:33:23 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-10-01 09:58:04 +0200 |
| commit | 007a61ae2f35c7fcf767313285c4924e81f11983 (patch) | |
| tree | 50d021b575ac183f08ee8e0b8a23e45728c3d719 | |
| parent | bcache: use llist_for_each_entry_safe() in __closure_wake_up() (diff) | |
| download | linux-007a61ae2f35c7fcf767313285c4924e81f11983.tar.xz linux-007a61ae2f35c7fcf767313285c4924e81f11983.zip | |
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: d934f9848a77 "nvme: provide UUID value to userspace"
Signed-off-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index bb2aad078637..5a14cc7f28ee 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -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; } |