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

Commit b89f704a authored by Guoqing Jiang's avatar Guoqing Jiang Committed by NeilBrown
Browse files

md-cluster: use %pU to print UUIDs 



Reviewed-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent 25b2edfa

drivers/md/md-cluster.c

+2 −14
Original line number Diff line number Diff line
@@ -177,18 +177,6 @@ static void lockres_free(struct dlm_lock_resource *res) 
	kfree(res);

}



static char *pretty_uuid(char *dest, char *src)

{

	int i, len = 0;



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

		if (i == 4 || i == 6 || i == 8 || i == 10)

			len += sprintf(dest + len, "-");

		len += sprintf(dest + len, "%02x", (__u8)src[i]);

	}

	return dest;

}



static void add_resync_info(struct mddev *mddev, struct dlm_lock_resource *lockres,

		sector_t lo, sector_t hi)

{
@@ -388,7 +376,7 @@ static void process_add_new_disk(struct mddev *mddev, struct cluster_msg *cmsg) 
	int len;



	len = snprintf(disk_uuid, 64, "DEVICE_UUID=");

	pretty_uuid(disk_uuid + len, cmsg->uuid);

	sprintf(disk_uuid + len, "%pU", cmsg->uuid);

	snprintf(raid_slot, 16, "RAID_DISK=%d", cmsg->raid_slot);

	pr_info("%s:%d Sending kobject change with %s and %s\n", __func__, __LINE__, disk_uuid, raid_slot);

	init_completion(&cinfo->newdisk_completion);
@@ -646,7 +634,7 @@ static int join(struct mddev *mddev, int nodes) 
	mddev->cluster_info = cinfo;



	memset(str, 0, 64);

	pretty_uuid(str, mddev->uuid);

	sprintf(str, "%pU", mddev->uuid);

	ret = dlm_new_lockspace(str, mddev->bitmap_info.cluster_name,

				DLM_LSFL_FS, LVB_SIZE,

				&md_ls_ops, mddev, &ops_rv, &cinfo->lockspace);