Commit d1c6e08e authored by Dan Williams's avatar Dan Williams
Browse files

libnvdimm/labels: Add uuid helpers 



In preparation for CXL labels that move the uuid to a different offset
in the label, add nsl_{ref,get,validate}_uuid(). These helpers use the
proper uuid_t type. That type definition predated the libnvdimm
subsystem, so now is as a good a time as any to convert all the uuid
handling in the subsystem to uuid_t to match the helpers.

Note that the uuid fields in the label data and superblocks is not
replaced per Andy's expectation that uuid_t is a kernel internal type
not to appear in external ABI interfaces. So, in those case
{import,export}_uuid() is used to go between the 2 types.

Also note that this rework uncovered some unnecessary copies for label
comparisons, those are cleaned up with nsl_uuid_equal().

As for the whitespace changes, all new code is clang-format compliant.

Reported-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/163116429748.2460985.15659993454313919977.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent e4e737bb

drivers/nvdimm/btt.c

+6 −5
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ static int btt_arena_write_layout(struct arena_info *arena) 
	u64 sum;

	struct btt_sb *super;

	struct nd_btt *nd_btt = arena->nd_btt;

	const u8 *parent_uuid = nd_dev_to_uuid(&nd_btt->ndns->dev);

	const uuid_t *parent_uuid = nd_dev_to_uuid(&nd_btt->ndns->dev);



	ret = btt_map_init(arena);

	if (ret)
@@ -988,8 +988,8 @@ static int btt_arena_write_layout(struct arena_info *arena) 
		return -ENOMEM;



	strncpy(super->signature, BTT_SIG, BTT_SIG_LEN);

	memcpy(super->uuid, nd_btt->uuid, 16);

	memcpy(super->parent_uuid, parent_uuid, 16);

	export_uuid(super->uuid, nd_btt->uuid);

	export_uuid(super->parent_uuid, parent_uuid);

	super->flags = cpu_to_le32(arena->flags);

	super->version_major = cpu_to_le16(arena->version_major);

	super->version_minor = cpu_to_le16(arena->version_minor);
@@ -1575,7 +1575,8 @@ static void btt_blk_cleanup(struct btt *btt) 
 * Pointer to a new struct btt on success, NULL on failure.

 */

static struct btt *btt_init(struct nd_btt *nd_btt, unsigned long long rawsize,

		u32 lbasize, u8 *uuid, struct nd_region *nd_region)

			    u32 lbasize, uuid_t *uuid,

			    struct nd_region *nd_region)

{

	int ret;

	struct btt *btt;

drivers/nvdimm/btt_devs.c

+8 −6
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ bool is_nd_btt(struct device *dev) 
EXPORT_SYMBOL(is_nd_btt);



static struct device *__nd_btt_create(struct nd_region *nd_region,

		unsigned long lbasize, u8 *uuid,

				      unsigned long lbasize, uuid_t *uuid,

				      struct nd_namespace_common *ndns)

{

	struct nd_btt *nd_btt;
@@ -244,14 +244,16 @@ struct device *nd_btt_create(struct nd_region *nd_region) 
 */

bool nd_btt_arena_is_valid(struct nd_btt *nd_btt, struct btt_sb *super)

{

	const u8 *parent_uuid = nd_dev_to_uuid(&nd_btt->ndns->dev);

	const uuid_t *ns_uuid = nd_dev_to_uuid(&nd_btt->ndns->dev);

	uuid_t parent_uuid;

	u64 checksum;



	if (memcmp(super->signature, BTT_SIG, BTT_SIG_LEN) != 0)

		return false;



	if (!guid_is_null((guid_t *)&super->parent_uuid))

		if (memcmp(super->parent_uuid, parent_uuid, 16) != 0)

	import_uuid(&parent_uuid, super->parent_uuid);

	if (!uuid_is_null(&parent_uuid))

		if (!uuid_equal(&parent_uuid, ns_uuid))

			return false;



	checksum = le64_to_cpu(super->checksum);
@@ -319,7 +321,7 @@ static int __nd_btt_probe(struct nd_btt *nd_btt, 
		return rc;



	nd_btt->lbasize = le32_to_cpu(btt_sb->external_lbasize);

	nd_btt->uuid = kmemdup(btt_sb->uuid, 16, GFP_KERNEL);

	nd_btt->uuid = kmemdup(&btt_sb->uuid, sizeof(uuid_t), GFP_KERNEL);

	if (!nd_btt->uuid)

		return -ENOMEM;

drivers/nvdimm/core.c

+4 −36
Original line number Diff line number Diff line
@@ -206,38 +206,6 @@ struct device *to_nvdimm_bus_dev(struct nvdimm_bus *nvdimm_bus) 
}

EXPORT_SYMBOL_GPL(to_nvdimm_bus_dev);



static bool is_uuid_sep(char sep)

{

	if (sep == '\n' || sep == '-' || sep == ':' || sep == '\0')

		return true;

	return false;

}



static int nd_uuid_parse(struct device *dev, u8 *uuid_out, const char *buf,

		size_t len)

{

	const char *str = buf;

	u8 uuid[16];

	int i;



	for (i = 0; i < 16; i++) {

		if (!isxdigit(str[0]) || !isxdigit(str[1])) {

			dev_dbg(dev, "pos: %d buf[%zd]: %c buf[%zd]: %c\n",

					i, str - buf, str[0],

					str + 1 - buf, str[1]);

			return -EINVAL;

		}



		uuid[i] = (hex_to_bin(str[0]) << 4) | hex_to_bin(str[1]);

		str += 2;

		if (is_uuid_sep(*str))

			str++;

	}



	memcpy(uuid_out, uuid, sizeof(uuid));

	return 0;

}



/**

 * nd_uuid_store: common implementation for writing 'uuid' sysfs attributes

 * @dev: container device for the uuid property
@@ -248,21 +216,21 @@ static int nd_uuid_parse(struct device *dev, u8 *uuid_out, const char *buf, 
 * (driver detached)

 * LOCKING: expects nd_device_lock() is held on entry

 */

int nd_uuid_store(struct device *dev, u8 **uuid_out, const char *buf,

int nd_uuid_store(struct device *dev, uuid_t **uuid_out, const char *buf,

		size_t len)

{

	u8 uuid[16];

	uuid_t uuid;

	int rc;



	if (dev->driver)

		return -EBUSY;



	rc = nd_uuid_parse(dev, uuid, buf, len);

	rc = uuid_parse(buf, &uuid);

	if (rc)

		return rc;



	kfree(*uuid_out);

	*uuid_out = kmemdup(uuid, sizeof(uuid), GFP_KERNEL);

	*uuid_out = kmemdup(&uuid, sizeof(uuid), GFP_KERNEL);

	if (!(*uuid_out))

		return -ENOMEM;

drivers/nvdimm/label.c

+14 −20
Original line number Diff line number Diff line
@@ -321,7 +321,8 @@ static bool preamble_index(struct nvdimm_drvdata *ndd, int idx, 
	return true;

}



char *nd_label_gen_id(struct nd_label_id *label_id, u8 *uuid, u32 flags)

char *nd_label_gen_id(struct nd_label_id *label_id, const uuid_t *uuid,

		      u32 flags)

{

	if (!label_id || !uuid)

		return NULL;
@@ -400,9 +401,9 @@ int nd_label_reserve_dpa(struct nvdimm_drvdata *ndd) 
		struct nvdimm *nvdimm = to_nvdimm(ndd->dev);

		struct nd_namespace_label *nd_label;

		struct nd_region *nd_region = NULL;

		u8 label_uuid[NSLABEL_UUID_LEN];

		struct nd_label_id label_id;

		struct resource *res;

		uuid_t label_uuid;

		u32 flags;



		nd_label = to_label(ndd, slot);
@@ -410,11 +411,11 @@ int nd_label_reserve_dpa(struct nvdimm_drvdata *ndd) 
		if (!slot_valid(ndd, nd_label, slot))

			continue;



		memcpy(label_uuid, nd_label->uuid, NSLABEL_UUID_LEN);

		nsl_get_uuid(ndd, nd_label, &label_uuid);

		flags = nsl_get_flags(ndd, nd_label);

		if (test_bit(NDD_NOBLK, &nvdimm->flags))

			flags &= ~NSLABEL_FLAG_LOCAL;

		nd_label_gen_id(&label_id, label_uuid, flags);

		nd_label_gen_id(&label_id, &label_uuid, flags);

		res = nvdimm_allocate_dpa(ndd, &label_id,

					  nsl_get_dpa(ndd, nd_label),

					  nsl_get_rawsize(ndd, nd_label));
@@ -851,7 +852,7 @@ static int __pmem_label_update(struct nd_region *nd_region, 


	nd_label = to_label(ndd, slot);

	memset(nd_label, 0, sizeof_namespace_label(ndd));

	memcpy(nd_label->uuid, nspm->uuid, NSLABEL_UUID_LEN);

	nsl_set_uuid(ndd, nd_label, nspm->uuid);

	nsl_set_name(ndd, nd_label, nspm->alt_name);

	nsl_set_flags(ndd, nd_label, flags);

	nsl_set_nlabel(ndd, nd_label, nd_region->ndr_mappings);
@@ -878,9 +879,8 @@ static int __pmem_label_update(struct nd_region *nd_region, 
	list_for_each_entry(label_ent, &nd_mapping->labels, list) {

		if (!label_ent->label)

			continue;

		if (test_and_clear_bit(ND_LABEL_REAP, &label_ent->flags)

				|| memcmp(nspm->uuid, label_ent->label->uuid,

					NSLABEL_UUID_LEN) == 0)

		if (test_and_clear_bit(ND_LABEL_REAP, &label_ent->flags) ||

		    nsl_uuid_equal(ndd, label_ent->label, nspm->uuid))

			reap_victim(nd_mapping, label_ent);

	}
@@ -1005,7 +1005,6 @@ static int __blk_label_update(struct nd_region *nd_region, 
	unsigned long *free, *victim_map = NULL;

	struct resource *res, **old_res_list;

	struct nd_label_id label_id;

	u8 uuid[NSLABEL_UUID_LEN];

	int min_dpa_idx = 0;

	LIST_HEAD(list);

	u32 nslot, slot;
@@ -1043,8 +1042,7 @@ static int __blk_label_update(struct nd_region *nd_region, 
		/* mark unused labels for garbage collection */

		for_each_clear_bit_le(slot, free, nslot) {

			nd_label = to_label(ndd, slot);

			memcpy(uuid, nd_label->uuid, NSLABEL_UUID_LEN);

			if (memcmp(uuid, nsblk->uuid, NSLABEL_UUID_LEN) != 0)

			if (!nsl_uuid_equal(ndd, nd_label, nsblk->uuid))

				continue;

			res = to_resource(ndd, nd_label);

			if (res && is_old_resource(res, old_res_list,
@@ -1113,7 +1111,7 @@ static int __blk_label_update(struct nd_region *nd_region, 


		nd_label = to_label(ndd, slot);

		memset(nd_label, 0, sizeof_namespace_label(ndd));

		memcpy(nd_label->uuid, nsblk->uuid, NSLABEL_UUID_LEN);

		nsl_set_uuid(ndd, nd_label, nsblk->uuid);

		nsl_set_name(ndd, nd_label, nsblk->alt_name);

		nsl_set_flags(ndd, nd_label, NSLABEL_FLAG_LOCAL);
@@ -1161,8 +1159,7 @@ static int __blk_label_update(struct nd_region *nd_region, 
		if (!nd_label)

			continue;

		nlabel++;

		memcpy(uuid, nd_label->uuid, NSLABEL_UUID_LEN);

		if (memcmp(uuid, nsblk->uuid, NSLABEL_UUID_LEN) != 0)

		if (!nsl_uuid_equal(ndd, nd_label, nsblk->uuid))

			continue;

		nlabel--;

		list_move(&label_ent->list, &list);
@@ -1192,8 +1189,7 @@ static int __blk_label_update(struct nd_region *nd_region, 
	}

	for_each_clear_bit_le(slot, free, nslot) {

		nd_label = to_label(ndd, slot);

		memcpy(uuid, nd_label->uuid, NSLABEL_UUID_LEN);

		if (memcmp(uuid, nsblk->uuid, NSLABEL_UUID_LEN) != 0)

		if (!nsl_uuid_equal(ndd, nd_label, nsblk->uuid))

			continue;

		res = to_resource(ndd, nd_label);

		res->flags &= ~DPA_RESOURCE_ADJUSTED;
@@ -1273,12 +1269,11 @@ static int init_labels(struct nd_mapping *nd_mapping, int num_labels) 
	return max(num_labels, old_num_labels);

}



static int del_labels(struct nd_mapping *nd_mapping, u8 *uuid)

static int del_labels(struct nd_mapping *nd_mapping, uuid_t *uuid)

{

	struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);

	struct nd_label_ent *label_ent, *e;

	struct nd_namespace_index *nsindex;

	u8 label_uuid[NSLABEL_UUID_LEN];

	unsigned long *free;

	LIST_HEAD(list);

	u32 nslot, slot;
@@ -1298,8 +1293,7 @@ static int del_labels(struct nd_mapping *nd_mapping, u8 *uuid) 
		if (!nd_label)

			continue;

		active++;

		memcpy(label_uuid, nd_label->uuid, NSLABEL_UUID_LEN);

		if (memcmp(label_uuid, uuid, NSLABEL_UUID_LEN) != 0)

		if (!nsl_uuid_equal(ndd, nd_label, uuid))

			continue;

		active--;

		slot = to_slot(ndd, nd_label);

drivers/nvdimm/namespace_devs.c

+50 −40
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static bool is_namespace_io(const struct device *dev); 


static int is_uuid_busy(struct device *dev, void *data)

{

	u8 *uuid1 = data, *uuid2 = NULL;

	uuid_t *uuid1 = data, *uuid2 = NULL;



	if (is_namespace_pmem(dev)) {

		struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
@@ -71,7 +71,7 @@ static int is_uuid_busy(struct device *dev, void *data) 
		uuid2 = nd_pfn->uuid;

	}



	if (uuid2 && memcmp(uuid1, uuid2, NSLABEL_UUID_LEN) == 0)

	if (uuid2 && uuid_equal(uuid1, uuid2))

		return -EBUSY;



	return 0;
@@ -89,7 +89,7 @@ static int is_namespace_uuid_busy(struct device *dev, void *data) 
 * @dev: any device on a nvdimm_bus

 * @uuid: uuid to check

 */

bool nd_is_uuid_unique(struct device *dev, u8 *uuid)

bool nd_is_uuid_unique(struct device *dev, uuid_t *uuid)

{

	struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);
@@ -192,12 +192,10 @@ const char *nvdimm_namespace_disk_name(struct nd_namespace_common *ndns, 
}

EXPORT_SYMBOL(nvdimm_namespace_disk_name);



const u8 *nd_dev_to_uuid(struct device *dev)

const uuid_t *nd_dev_to_uuid(struct device *dev)

{

	static const u8 null_uuid[16];



	if (!dev)

		return null_uuid;

		return &uuid_null;



	if (is_namespace_pmem(dev)) {

		struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
@@ -208,7 +206,7 @@ const u8 *nd_dev_to_uuid(struct device *dev) 


		return nsblk->uuid;

	} else

		return null_uuid;

		return &uuid_null;

}

EXPORT_SYMBOL(nd_dev_to_uuid);
@@ -938,7 +936,8 @@ static void nd_namespace_pmem_set_resource(struct nd_region *nd_region, 
	res->end = res->start + size - 1;

}



static bool uuid_not_set(const u8 *uuid, struct device *dev, const char *where)

static bool uuid_not_set(const uuid_t *uuid, struct device *dev,

			 const char *where)

{

	if (!uuid) {

		dev_dbg(dev, "%s: uuid not set\n", where);
@@ -957,7 +956,7 @@ static ssize_t __size_store(struct device *dev, unsigned long long val) 
	struct nd_label_id label_id;

	u32 flags = 0, remainder;

	int rc, i, id = -1;

	u8 *uuid = NULL;

	uuid_t *uuid = NULL;



	if (dev->driver || ndns->claim)

		return -EBUSY;
@@ -1050,7 +1049,7 @@ static ssize_t size_store(struct device *dev, 
{

	struct nd_region *nd_region = to_nd_region(dev->parent);

	unsigned long long val;

	u8 **uuid = NULL;

	uuid_t **uuid = NULL;

	int rc;



	rc = kstrtoull(buf, 0, &val);
@@ -1147,7 +1146,7 @@ static ssize_t size_show(struct device *dev, 
}

static DEVICE_ATTR(size, 0444, size_show, size_store);



static u8 *namespace_to_uuid(struct device *dev)

static uuid_t *namespace_to_uuid(struct device *dev)

{

	if (is_namespace_pmem(dev)) {

		struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
@@ -1161,10 +1160,10 @@ static u8 *namespace_to_uuid(struct device *dev) 
		return ERR_PTR(-ENXIO);

}



static ssize_t uuid_show(struct device *dev,

		struct device_attribute *attr, char *buf)

static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,

			 char *buf)

{

	u8 *uuid = namespace_to_uuid(dev);

	uuid_t *uuid = namespace_to_uuid(dev);



	if (IS_ERR(uuid))

		return PTR_ERR(uuid);
@@ -1181,7 +1180,8 @@ static ssize_t uuid_show(struct device *dev, 
 * @old_uuid: reference to the uuid storage location in the namespace object

 */

static int namespace_update_uuid(struct nd_region *nd_region,

		struct device *dev, u8 *new_uuid, u8 **old_uuid)

				 struct device *dev, uuid_t *new_uuid,

				 uuid_t **old_uuid)

{

	u32 flags = is_namespace_blk(dev) ? NSLABEL_FLAG_LOCAL : 0;

	struct nd_label_id old_label_id;
@@ -1231,10 +1231,12 @@ static int namespace_update_uuid(struct nd_region *nd_region, 
		list_for_each_entry(label_ent, &nd_mapping->labels, list) {

			struct nd_namespace_label *nd_label = label_ent->label;

			struct nd_label_id label_id;

			uuid_t uuid;



			if (!nd_label)

				continue;

			nd_label_gen_id(&label_id, nd_label->uuid,

			nsl_get_uuid(ndd, nd_label, &uuid);

			nd_label_gen_id(&label_id, &uuid,

					nsl_get_flags(ndd, nd_label));

			if (strcmp(old_label_id.id, label_id.id) == 0)

				set_bit(ND_LABEL_REAP, &label_ent->flags);
@@ -1251,9 +1253,9 @@ static ssize_t uuid_store(struct device *dev, 
		struct device_attribute *attr, const char *buf, size_t len)

{

	struct nd_region *nd_region = to_nd_region(dev->parent);

	u8 *uuid = NULL;

	uuid_t *uuid = NULL;

	uuid_t **ns_uuid;

	ssize_t rc = 0;

	u8 **ns_uuid;



	if (is_namespace_pmem(dev)) {

		struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
@@ -1378,8 +1380,8 @@ static ssize_t dpa_extents_show(struct device *dev, 
{

	struct nd_region *nd_region = to_nd_region(dev->parent);

	struct nd_label_id label_id;

	uuid_t *uuid = NULL;

	int count = 0, i;

	u8 *uuid = NULL;

	u32 flags = 0;



	nvdimm_bus_lock(dev);
@@ -1831,7 +1833,7 @@ static struct device **create_namespace_io(struct nd_region *nd_region) 
	return devs;

}



static bool has_uuid_at_pos(struct nd_region *nd_region, u8 *uuid,

static bool has_uuid_at_pos(struct nd_region *nd_region, const uuid_t *uuid,

			    u64 cookie, u16 pos)

{

	struct nd_namespace_label *found = NULL;
@@ -1856,7 +1858,7 @@ static bool has_uuid_at_pos(struct nd_region *nd_region, u8 *uuid, 
			if (!nsl_validate_isetcookie(ndd, nd_label, cookie))

				continue;



			if (memcmp(nd_label->uuid, uuid, NSLABEL_UUID_LEN) != 0)

			if (!nsl_uuid_equal(ndd, nd_label, uuid))

				continue;



			if (!nsl_validate_type_guid(ndd, nd_label,
@@ -1881,7 +1883,7 @@ static bool has_uuid_at_pos(struct nd_region *nd_region, u8 *uuid, 
	return found != NULL;

}



static int select_pmem_id(struct nd_region *nd_region, u8 *pmem_id)

static int select_pmem_id(struct nd_region *nd_region, const uuid_t *pmem_id)

{

	int i;
@@ -1900,7 +1902,7 @@ static int select_pmem_id(struct nd_region *nd_region, u8 *pmem_id) 
			nd_label = label_ent->label;

			if (!nd_label)

				continue;

			if (memcmp(nd_label->uuid, pmem_id, NSLABEL_UUID_LEN) == 0)

			if (nsl_uuid_equal(ndd, nd_label, pmem_id))

				break;

			nd_label = NULL;

		}
@@ -1923,7 +1925,8 @@ static int select_pmem_id(struct nd_region *nd_region, u8 *pmem_id) 
			/* pass */;

		else {

			dev_dbg(&nd_region->dev, "%s invalid label for %pUb\n",

					dev_name(ndd->dev), nd_label->uuid);

				dev_name(ndd->dev),

				nsl_uuid_raw(ndd, nd_label));

			return -EINVAL;

		}
@@ -1953,6 +1956,7 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region, 
	resource_size_t size = 0;

	struct resource *res;

	struct device *dev;

	uuid_t uuid;

	int rc = 0;

	u16 i;
@@ -1963,12 +1967,12 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region, 


	if (!nsl_validate_isetcookie(ndd, nd_label, cookie)) {

		dev_dbg(&nd_region->dev, "invalid cookie in label: %pUb\n",

				nd_label->uuid);

			nsl_uuid_raw(ndd, nd_label));

		if (!nsl_validate_isetcookie(ndd, nd_label, altcookie))

			return ERR_PTR(-EAGAIN);



		dev_dbg(&nd_region->dev, "valid altcookie in label: %pUb\n",

				nd_label->uuid);

			nsl_uuid_raw(ndd, nd_label));

	}



	nspm = kzalloc(sizeof(*nspm), GFP_KERNEL);
@@ -1984,9 +1988,12 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region, 
	res->flags = IORESOURCE_MEM;



	for (i = 0; i < nd_region->ndr_mappings; i++) {

		if (has_uuid_at_pos(nd_region, nd_label->uuid, cookie, i))

		uuid_t uuid;



		nsl_get_uuid(ndd, nd_label, &uuid);

		if (has_uuid_at_pos(nd_region, &uuid, cookie, i))

			continue;

		if (has_uuid_at_pos(nd_region, nd_label->uuid, altcookie, i))

		if (has_uuid_at_pos(nd_region, &uuid, altcookie, i))

			continue;

		break;

	}
@@ -2000,7 +2007,7 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region, 
		 * find a dimm with two instances of the same uuid.

		 */

		dev_err(&nd_region->dev, "%s missing label for %pUb\n",

				nvdimm_name(nvdimm), nd_label->uuid);

			nvdimm_name(nvdimm), nsl_uuid_raw(ndd, nd_label));

		rc = -EINVAL;

		goto err;

	}
@@ -2013,7 +2020,8 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region, 
	 * the dimm being enabled (i.e. nd_label_reserve_dpa()

	 * succeeded).

	 */

	rc = select_pmem_id(nd_region, nd_label->uuid);

	nsl_get_uuid(ndd, nd_label, &uuid);

	rc = select_pmem_id(nd_region, &uuid);

	if (rc)

		goto err;
@@ -2039,8 +2047,8 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region, 
		WARN_ON(nspm->alt_name || nspm->uuid);

		nspm->alt_name = kmemdup(nsl_ref_name(ndd, label0),

					 NSLABEL_NAME_LEN, GFP_KERNEL);

		nspm->uuid = kmemdup((void __force *) label0->uuid,

				NSLABEL_UUID_LEN, GFP_KERNEL);

		nsl_get_uuid(ndd, label0, &uuid);

		nspm->uuid = kmemdup(&uuid, sizeof(uuid_t), GFP_KERNEL);

		nspm->lbasize = nsl_get_lbasize(ndd, label0);

		nspm->nsio.common.claim_class =

			nsl_get_claim_class(ndd, label0);
@@ -2217,15 +2225,15 @@ static int add_namespace_resource(struct nd_region *nd_region, 
	int i;



	for (i = 0; i < count; i++) {

		u8 *uuid = namespace_to_uuid(devs[i]);

		uuid_t *uuid = namespace_to_uuid(devs[i]);

		struct resource *res;



		if (IS_ERR_OR_NULL(uuid)) {

		if (IS_ERR(uuid)) {

			WARN_ON(1);

			continue;

		}



		if (memcmp(uuid, nd_label->uuid, NSLABEL_UUID_LEN) != 0)

		if (!nsl_uuid_equal(ndd, nd_label, uuid))

			continue;

		if (is_namespace_blk(devs[i])) {

			res = nsblk_add_resource(nd_region, ndd,
@@ -2237,7 +2245,7 @@ static int add_namespace_resource(struct nd_region *nd_region, 
		} else {

			dev_err(&nd_region->dev,

				"error: conflicting extents for uuid: %pUb\n",

					nd_label->uuid);

				uuid);

			return -ENXIO;

		}

		break;
@@ -2257,6 +2265,7 @@ static struct device *create_namespace_blk(struct nd_region *nd_region, 
	char name[NSLABEL_NAME_LEN];

	struct device *dev = NULL;

	struct resource *res;

	uuid_t uuid;



	if (!nsl_validate_type_guid(ndd, nd_label, &nd_set->type_guid))

		return ERR_PTR(-EAGAIN);
@@ -2271,7 +2280,8 @@ static struct device *create_namespace_blk(struct nd_region *nd_region, 
	dev->parent = &nd_region->dev;

	nsblk->id = -1;

	nsblk->lbasize = nsl_get_lbasize(ndd, nd_label);

	nsblk->uuid = kmemdup(nd_label->uuid, NSLABEL_UUID_LEN, GFP_KERNEL);

	nsl_get_uuid(ndd, nd_label, &uuid);

	nsblk->uuid = kmemdup(&uuid, sizeof(uuid_t), GFP_KERNEL);

	nsblk->common.claim_class = nsl_get_claim_class(ndd, nd_label);

	if (!nsblk->uuid)

		goto blk_err;