Commit af5683b7 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

lvol: read uuid xattr before name 



This just moves some code around in preparation for an upcoming patch -
no functional change.

Change-Id: Ib1584fcf65d1be2063766588a79c434ad5fef716
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/404032


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent a15c694c

lib/lvol/lvol.c

+9 −8
Original line number Diff line number Diff line
@@ -193,6 +193,15 @@ _spdk_load_next_lvol(void *cb_arg, struct spdk_blob *blob, int lvolerrno) 
	lvol->blob_id = blob_id;

	lvol->lvol_store = lvs;

	lvol->close_only = false;



	rc = spdk_blob_get_xattr_value(blob, "uuid", (const void **)&attr, &value_len);

	if (rc != 0 || value_len != SPDK_UUID_STRING_LEN || attr[SPDK_UUID_STRING_LEN - 1] != '\0' ||

	    spdk_uuid_parse(&lvol->uuid, attr) != 0) {

		SPDK_INFOLOG(SPDK_LOG_LVOL, "Missing or corrupt lvol uuid\n");

		memset(&lvol->uuid, 0, sizeof(lvol->uuid));

	}

	spdk_uuid_fmt_lower(lvol->uuid_str, sizeof(lvol->uuid_str), &lvol->uuid);



	spdk_uuid_fmt_lower(uuid, sizeof(uuid), &lvol->lvol_store->uuid);

	lvol->unique_id = spdk_sprintf_alloc("%s_%"PRIu64, uuid, (uint64_t)blob_id);

	if (!lvol->unique_id) {
@@ -213,14 +222,6 @@ _spdk_load_next_lvol(void *cb_arg, struct spdk_blob *blob, int lvolerrno) 


	strncpy(lvol->name, attr, SPDK_LVOL_NAME_MAX);



	rc = spdk_blob_get_xattr_value(blob, "uuid", (const void **)&attr, &value_len);

	if (rc != 0 || value_len != SPDK_UUID_STRING_LEN || attr[SPDK_UUID_STRING_LEN - 1] != '\0' ||

	    spdk_uuid_parse(&lvol->uuid, attr) != 0) {

		SPDK_INFOLOG(SPDK_LOG_LVOL, "Missing or corrupt lvol uuid\n");

		memset(&lvol->uuid, 0, sizeof(lvol->uuid));

	}

	spdk_uuid_fmt_lower(lvol->uuid_str, sizeof(lvol->uuid_str), &lvol->uuid);



	TAILQ_INSERT_TAIL(&lvs->lvols, lvol, link);



	lvs->lvol_count++;