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

Commit 90985b84 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Christoph Hellwig
Browse files

nvme: rename uuid to nguid in nvme_ns 



The uuid field in the nvme_ns structure represents the nguid field
from the identify namespace command. And as NVMe 1.3 introduced an
UUID in the NVMe Namespace Identification Descriptor this will
collide.

So rename the uuid to nguid to prevent any further
confusion. Unfortunately we export the nguid to sysfs in the uuid
sysfs attribute, but this can't be changed anymore without possibly
breaking existing userspace.

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent af8b86e9

drivers/nvme/host/core.c

+5 −5
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ static int nvme_revalidate_ns(struct nvme_ns *ns, struct nvme_id_ns **id) 
	if (ns->ctrl->vs >= NVME_VS(1, 1, 0))

		memcpy(ns->eui, (*id)->eui64, sizeof(ns->eui));

	if (ns->ctrl->vs >= NVME_VS(1, 2, 0))

		memcpy(ns->uuid, (*id)->nguid, sizeof(ns->uuid));

		memcpy(ns->nguid, (*id)->nguid, sizeof(ns->nguid));



	return 0;

}
@@ -1784,8 +1784,8 @@ static ssize_t wwid_show(struct device *dev, struct device_attribute *attr, 
	int serial_len = sizeof(ctrl->serial);

	int model_len = sizeof(ctrl->model);



	if (memchr_inv(ns->uuid, 0, sizeof(ns->uuid)))

		return sprintf(buf, "eui.%16phN\n", ns->uuid);

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

		return sprintf(buf, "eui.%16phN\n", ns->nguid);



	if (memchr_inv(ns->eui, 0, sizeof(ns->eui)))

		return sprintf(buf, "eui.%8phN\n", ns->eui);
@@ -1804,7 +1804,7 @@ static ssize_t uuid_show(struct device *dev, struct device_attribute *attr, 
								char *buf)

{

	struct nvme_ns *ns = nvme_get_ns_from_dev(dev);

	return sprintf(buf, "%pU\n", ns->uuid);

	return sprintf(buf, "%pU\n", ns->nguid);

}

static DEVICE_ATTR(uuid, S_IRUGO, uuid_show, NULL);
@@ -1839,7 +1839,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 (!memchr_inv(ns->uuid, 0, sizeof(ns->uuid)))

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

			return 0;

	}

	if (a == &dev_attr_eui.attr) {

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ struct nvme_ns { 
	int instance;



	u8 eui[8];

	u8 uuid[16];

	u8 nguid[16];



	unsigned ns_id;

	int lba_shift;