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

Commit 8990cdf1 authored by Dan Williams's avatar Dan Williams
Browse files

libnvdimm, label: switch to using v1.2 labels by default 



The rules for which version of the label specification are in effect at
any given point in time are as follows:

1/ If a DIMM has an existing / valid index block then the version
   specified is used regardless if it is a previous version.

2/ By default when the kernel is initializing new index blocks the
   latest specification version (v1.2 at time of writing) is used.

3/ An environment that wants to force create v1.1 label-sets must
   arrange for userspace to disable all active regions / namespaces /
   dimms and write a valid set of v1.1 index blocks to the dimms.

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

drivers/nvdimm/label.c

+7 −3
Original line number Diff line number Diff line
@@ -222,9 +222,10 @@ int nd_label_validate(struct nvdimm_drvdata *ndd) 
	 * need to know the size of the labels, and we can't trust the

	 * size of the labels until we validate the index blocks.

	 * Resolve this dependency loop by probing for known label

	 * sizes.

	 * sizes, but default to v1.2 256-byte namespace labels if

	 * discovery fails.

	 */

	int label_size[] = { 256, 128 };

	int label_size[] = { 128, 256 };

	int i, rc;



	for (i = 0; i < ARRAY_SIZE(label_size); i++) {
@@ -532,7 +533,10 @@ static int nd_label_write_index(struct nvdimm_drvdata *ndd, int index, u32 seq, 
	nsindex->labeloff = __cpu_to_le64(offset);

	nsindex->nslot = __cpu_to_le32(nslot);

	nsindex->major = __cpu_to_le16(1);

	if (sizeof_namespace_label(ndd) < 256)

		nsindex->minor = __cpu_to_le16(1);

	else

		nsindex->minor = __cpu_to_le16(2);

	nsindex->checksum = __cpu_to_le64(0);

	if (flags & ND_NSINDEX_INIT) {

		unsigned long *free = (unsigned long *) nsindex->free;