From e336254463da8ffa9923118a9c802253d312b8bb Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 14 Dec 2006 17:31:19 +1100 Subject: [PATCH] Change 'Device Size' to 'Used Dev Size' because it only shows how much of each device is actually used, not how big they are. --- ChangeLog | 2 ++ Detail.c | 9 ++++++--- super0.c | 3 ++- super1.c | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c584ba19..bd3424ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ Changes Prior to this release - Increase raid456 stripe cache size if needed to --grow the array. The setting used unfortunately requires intimate knowledge of the kernel, and it not reset when the reshape finishes. + - Change 'Device Size' to 'Used Dev Size' because it only shows how + much of each device is actually used, not how big they are. Changes Prior to 2.5.6 release - Fix bug which meant "bitmap=xxx" in mdadm.conf was not handled diff --git a/Detail.c b/Detail.c index 832e0d87..42e99077 100644 --- a/Detail.c +++ b/Detail.c @@ -168,11 +168,14 @@ int Detail(char *dev, int brief, int test, char *homehost) (larray_size >= 0xFFFFFFFFULL|| array.size == 0)) { unsigned long long dsize = get_component_size(fd); if (dsize > 0) - printf(" Device Size : %llu%s\n", dsize, human_size((long long)array.size<<10)); + printf(" Used Dev Size : %llu%s\n", + dsize, + human_size((long long)array.size<<10)); else - printf(" Device Size : unknown\n"); + printf(" Used Dev Size : unknown\n"); } else - printf(" Device Size : %d%s\n", array.size, human_size((long long)array.size<<10)); + printf(" Used Dev Size : %d%s\n", array.size, + human_size((long long)array.size<<10)); } printf(" Raid Devices : %d\n", array.raid_disks); printf(" Total Devices : %d\n", array.nr_disks); diff --git a/super0.c b/super0.c index d2338a9d..2408c25b 100644 --- a/super0.c +++ b/super0.c @@ -116,7 +116,8 @@ static void examine_super0(void *sbv, char *homehost) printf(" Raid Level : %s\n", c?c:"-unknown-"); if ((int)sb->level >= 0) { int ddsks=0; - printf(" Device Size : %d%s\n", sb->size, human_size((long long)sb->size<<10)); + printf(" Used Dev Size : %d%s\n", sb->size, + human_size((long long)sb->size<<10)); switch(sb->level) { case 1: ddsks=1;break; case 4: diff --git a/super1.c b/super1.c index 18909497..b7d1c996 100644 --- a/super1.c +++ b/super1.c @@ -174,7 +174,9 @@ static void examine_super1(void *sbv, char *homehost) printf(" Raid Level : %s\n", c?c:"-unknown-"); printf(" Raid Devices : %d\n", __le32_to_cpu(sb->raid_disks)); printf("\n"); - printf(" Device Size : %llu%s\n", (unsigned long long)sb->data_size, human_size(sb->data_size<<9)); + printf(" Used Dev Size : %llu%s\n", + (unsigned long long)sb->data_size, + human_size(sb->data_size<<9)); if (__le32_to_cpu(sb->level) >= 0) { int ddsks=0; switch(__le32_to_cpu(sb->level)) { -- 2.39.2