diff options
| author |   Guoqing Jiang <gqjiang@suse.com> | 2015-07-10 16:54:02 +0800 |
|---|---|---|
| committer |   NeilBrown <neilb@suse.com> | 2015-08-31 19:40:30 +0200 |
| commit | b89f704a8ddf7be1a66af9aad350226ae283292f (patch) | |
| tree | b6c713b1800e6849bf9ad0bdd060e3e4f6e5506c /drivers/md | |
| parent | md: setup safemode_timer before it's being used (diff) | |
| download | linux-dev-b89f704a8ddf7be1a66af9aad350226ae283292f.tar.xz linux-dev-b89f704a8ddf7be1a66af9aad350226ae283292f.zip | |
md-cluster: use %pU to print UUIDs
Reviewed-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md-cluster.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c index 0072190515e0..85ef5c5aa350 100644 --- a/drivers/md/md-cluster.c +++ b/drivers/md/md-cluster.c @@ -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); |