From 2ef1c983d56438d4f53b1534545e6d0f54063ab8 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Thu, 29 Jan 2015 13:37:37 -0800 Subject: [PATCH] Display new user_uuid instead of internal cache set uuid Change-Id: I9166876dba44de96f8e3f2da8f16728cbb57540a --- bcache.c | 6 +++--- bcacheadm.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bcache.c b/bcache.c index 11f5c04f..fe214833 100644 --- a/bcache.c +++ b/bcache.c @@ -505,7 +505,7 @@ void write_backingdev_sb(int fd, unsigned block_size, unsigned *bucket_sizes, sb.block_size = block_size; uuid_unparse(sb.disk_uuid.b, uuid_str); - uuid_unparse(sb.set_uuid.b, set_uuid_str); + uuid_unparse(sb.user_uuid.b, set_uuid_str); if (label) memcpy(sb.label, label, SB_LABEL_SIZE); @@ -650,7 +650,7 @@ void write_cache_sbs(int *fds, struct cache_sb *sb, sb->csum = csum_set(sb, CACHE_SB_CSUM_TYPE(sb)); uuid_unparse(sb->disk_uuid.b, uuid_str); - uuid_unparse(sb->set_uuid.b, set_uuid_str); + uuid_unparse(sb->user_uuid.b, set_uuid_str); printf("UUID: %s\n" "Set UUID: %s\n" "version: %u\n" @@ -833,7 +833,7 @@ static void show_super_common(struct cache_sb *sb, bool force_csum) uuid_unparse(sb->disk_uuid.b, uuid); printf("dev.uuid\t\t%s\n", uuid); - uuid_unparse(sb->set_uuid.b, uuid); + uuid_unparse(sb->user_uuid.b, uuid); printf("cset.uuid\t\t%s\n", uuid); } diff --git a/bcacheadm.c b/bcacheadm.c index 6ffceaaa..c1394940 100644 --- a/bcacheadm.c +++ b/bcacheadm.c @@ -595,7 +595,7 @@ int bcache_query_devs(NihCommand *command, char *const *args) char set_uuid_str[40], dev_uuid_str[40]; char *clus_uuid = (char *)sb->label; - uuid_unparse(sb->set_uuid.b, set_uuid_str); + uuid_unparse(sb->user_uuid.b, set_uuid_str); uuid_unparse(sb->disk_uuid.b, dev_uuid_str); if (!strcmp(clus_uuid, "")) clus_uuid = "None"; @@ -641,7 +641,7 @@ int bcache_status(NihCommand *command, char *const *args) printf("Unable to find a superblock\n"); return -1; } else { - uuid_unparse(seq_sb->set_uuid.b, set_uuid); + uuid_unparse(seq_sb->user_uuid.b, set_uuid); printf("%-50s%-15s%-4s\n", "uuid", "state", "tier"); }