diff options
author | Joe Perches <joe@perches.com> | 2009-12-14 21:01:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:33 -0500 |
commit | 7b75c2f8cf6d938b571d3bc3f566f883ab7472c4 (patch) | |
tree | 480a924c730a56dfb06a0bec92b63e9086aa8287 /drivers/md/md.c | |
parent | bc058f65e8c7d83c139692e1c26513d3187dd744 (diff) |
drivers/md/md.c: use %pU to print UUIDs
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 6f9148623a4d..f4f5f82f9f53 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -1936,15 +1936,11 @@ static void print_sb_1(struct mdp_superblock_1 *sb) | |||
1936 | 1936 | ||
1937 | uuid = sb->set_uuid; | 1937 | uuid = sb->set_uuid; |
1938 | printk(KERN_INFO | 1938 | printk(KERN_INFO |
1939 | "md: SB: (V:%u) (F:0x%08x) Array-ID:<%02x%02x%02x%02x" | 1939 | "md: SB: (V:%u) (F:0x%08x) Array-ID:<%pU>\n" |
1940 | ":%02x%02x:%02x%02x:%02x%02x:%02x%02x%02x%02x%02x%02x>\n" | ||
1941 | "md: Name: \"%s\" CT:%llu\n", | 1940 | "md: Name: \"%s\" CT:%llu\n", |
1942 | le32_to_cpu(sb->major_version), | 1941 | le32_to_cpu(sb->major_version), |
1943 | le32_to_cpu(sb->feature_map), | 1942 | le32_to_cpu(sb->feature_map), |
1944 | uuid[0], uuid[1], uuid[2], uuid[3], | 1943 | uuid, |
1945 | uuid[4], uuid[5], uuid[6], uuid[7], | ||
1946 | uuid[8], uuid[9], uuid[10], uuid[11], | ||
1947 | uuid[12], uuid[13], uuid[14], uuid[15], | ||
1948 | sb->set_name, | 1944 | sb->set_name, |
1949 | (unsigned long long)le64_to_cpu(sb->ctime) | 1945 | (unsigned long long)le64_to_cpu(sb->ctime) |
1950 | & MD_SUPERBLOCK_1_TIME_SEC_MASK); | 1946 | & MD_SUPERBLOCK_1_TIME_SEC_MASK); |
@@ -1953,8 +1949,7 @@ static void print_sb_1(struct mdp_superblock_1 *sb) | |||
1953 | printk(KERN_INFO | 1949 | printk(KERN_INFO |
1954 | "md: L%u SZ%llu RD:%u LO:%u CS:%u DO:%llu DS:%llu SO:%llu" | 1950 | "md: L%u SZ%llu RD:%u LO:%u CS:%u DO:%llu DS:%llu SO:%llu" |
1955 | " RO:%llu\n" | 1951 | " RO:%llu\n" |
1956 | "md: Dev:%08x UUID: %02x%02x%02x%02x:%02x%02x:%02x%02x:%02x%02x" | 1952 | "md: Dev:%08x UUID: %pU\n" |
1957 | ":%02x%02x%02x%02x%02x%02x\n" | ||
1958 | "md: (F:0x%08x) UT:%llu Events:%llu ResyncOffset:%llu CSUM:0x%08x\n" | 1953 | "md: (F:0x%08x) UT:%llu Events:%llu ResyncOffset:%llu CSUM:0x%08x\n" |
1959 | "md: (MaxDev:%u) \n", | 1954 | "md: (MaxDev:%u) \n", |
1960 | le32_to_cpu(sb->level), | 1955 | le32_to_cpu(sb->level), |
@@ -1967,10 +1962,7 @@ static void print_sb_1(struct mdp_superblock_1 *sb) | |||
1967 | (unsigned long long)le64_to_cpu(sb->super_offset), | 1962 | (unsigned long long)le64_to_cpu(sb->super_offset), |
1968 | (unsigned long long)le64_to_cpu(sb->recovery_offset), | 1963 | (unsigned long long)le64_to_cpu(sb->recovery_offset), |
1969 | le32_to_cpu(sb->dev_number), | 1964 | le32_to_cpu(sb->dev_number), |
1970 | uuid[0], uuid[1], uuid[2], uuid[3], | 1965 | uuid, |
1971 | uuid[4], uuid[5], uuid[6], uuid[7], | ||
1972 | uuid[8], uuid[9], uuid[10], uuid[11], | ||
1973 | uuid[12], uuid[13], uuid[14], uuid[15], | ||
1974 | sb->devflags, | 1966 | sb->devflags, |
1975 | (unsigned long long)le64_to_cpu(sb->utime) & MD_SUPERBLOCK_1_TIME_SEC_MASK, | 1967 | (unsigned long long)le64_to_cpu(sb->utime) & MD_SUPERBLOCK_1_TIME_SEC_MASK, |
1976 | (unsigned long long)le64_to_cpu(sb->events), | 1968 | (unsigned long long)le64_to_cpu(sb->events), |