Have --examine report reshape details.

Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/md_p.h b/md_p.h
index 0a0b38156fd38d3e5a6dc706fd7c8e9b0d9b8e42..ed2e5fd92dd66f7c6977ca88a8b4cd52473f410f 100644 (file)
--- a/md_p.h
+++ b/md_p.h
@@ -147,7 +147,13 @@ typedef struct mdp_superblock_s {
        __u32 cp_events_hi;     /* 10 high-order of checkpoint update count   */
 #endif
        __u32 recovery_cp;      /* 11 recovery checkpoint sector count        */
-       __u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 12];
+       /* There are only valid for minor_version > 90 */
+       __u64 reshape_position; /* 12,13 next address in array-space for reshape */
+       __u32 new_level;        /* 14 new level we are reshaping to           */
+       __u32 delta_disks;      /* 15 change in number of raid_disks          */
+       __u32 new_layout;       /* 16 new layout                              */
+       __u32 new_chunk;        /* 17 new chunk size (bytes)                  */
+       __u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 18];
 
        /*
         * Personality information

diff --git a/super0.c b/super0.c
index aa7cdd986a36dcfb2f1333a420d0c0b0fadeb2d8..84930d8a4ab04dd21ef55c00d355b94fe587ac5c 100644 (file)
--- a/super0.c
+++ b/super0.c
@@ -105,12 +105,51 @@ static void examine_super0(void *sbv)
        printf("  Creation Time : %.24s\n", ctime(&atime));
        c=map_num(pers, sb->level);
        printf("     Raid Level : %s\n", c?c:"-unknown-");
-       if ((int)sb->level >= 0)
+       if ((int)sb->level >= 0) {
+               int ddsks=0;
                printf("    Device Size : %d%s\n", sb->size, human_size((long long)sb->size<<10));
+               switch(sb->level) {
+               case 1: ddsks=1;break;
+               case 4:
+               case 5: ddsks = sb->raid_disks-1; break;
+               case 6: ddsks = sb->raid_disks-2; break;
+               case 10: ddsks = sb->raid_disks / (sb->layout&255) / ((sb->layout>>8)&255);
+               }
+               if (ddsks)
+                       printf("     Array Size : %llu%s\n", (unsigned long long)ddsks * sb->size,
+                              human_size(ddsks*(long long)sb->size<<10));
+       }
        printf("   Raid Devices : %d\n", sb->raid_disks);
        printf("  Total Devices : %d\n", sb->nr_disks);
        printf("Preferred Minor : %d\n", sb->md_minor);
        printf("\n");
+       if (sb->minor_version > 90 && (sb->reshape_position+1) != 0) {
+               printf("  Reshape pos'n : %llu%s\n", sb->reshape_position/2, human_size((long long)sb->reshape_position<<9));
+               if (sb->delta_disks) {
+                       printf("  Delta Devices : %d", sb->delta_disks);
+                       if (sb->delta_disks)
+                               printf(" (%d->%d)\n", sb->raid_disks-sb->delta_disks, sb->raid_disks);
+                       else
+                               printf(" (%d->%d)\n", sb->raid_disks, sb->raid_disks+sb->delta_disks);
+               }
+               if (sb->new_level != sb->level) {
+                       c = map_num(pers, sb->new_level);
+                       printf("      New Level : %s\n", c?c:"-unknown-");
+               }
+               if (sb->new_layout != sb->layout) {
+                       if (sb->level == 5) {
+                               c = map_num(r5layout, sb->new_layout);
+                               printf("     New Layout : %s\n", c?c:"-unknown-");
+                       }
+                       if (sb->level == 10) {
+                               printf("     New Layout : near=%d, far=%d\n",
+                                      sb->new_layout&255, (sb->new_layout>>8)&255);
+                       }
+               }
+               if (sb->new_chunk != sb->chunk_size)
+                       printf("  New Chunksize : %d\n", sb->new_chunk);
+               printf("\n");
+       }
        atime = sb->utime;
        printf("    Update Time : %.24s\n", ctime(&atime));
        printf("          State : %s\n",

diff --git a/super1.c b/super1.c
index 190ec60fe09bdbd8f17325d05672595f00ddd419..a503b945220a763df0c689d08a05f56af7c6e3b0 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -58,7 +58,14 @@ struct mdp_superblock_1 {
                                 * NOTE: signed, so bitmap can be before superblock
                                 * only meaningful of feature_map[0] is set.
                                 */
-       __u8    pad1[128-100];  /* set to 0 when written */
+
+       /* These are only valid with feature bit '4' */
+       __u64   reshape_position;       /* next address in array-space for reshape */
+       __u32   new_level;      /* new level we are reshaping to                */
+       __u32   delta_disks;    /* change in number of raid_disks               */
+       __u32   new_layout;     /* new layout                                   */
+       __u32   new_chunk;      /* new chunk size (bytes)                       */
+       __u8    pad1[128-124];  /* set to 0 when written */
 
        /* constant this-device information - 64 bytes */
        __u64   data_offset;    /* sector start of data, often 0 */
@@ -94,8 +101,9 @@ struct mdp_superblock_1 {
 #define        MD_FEATURE_RECOVERY_OFFSET      2 /* recovery_offset is present and
                                           * must be honoured
                                           */
+#define        MD_FEATURE_RESHAPE_ACTIVE       4
 
-#define        MD_FEATURE_ALL                  (1|2)
+#define        MD_FEATURE_ALL                  (1|2|4)
 
 #ifndef offsetof
 #define offsetof(t,f) ((int)&(((t*)0)->f))
@@ -156,8 +164,20 @@ static void examine_super1(void *sbv)
        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));
-       if (sb->size != sb->data_size)
-               printf("      Used Size : %llu%s\n", (unsigned long long)sb->size, human_size(sb->size<<9));
+       if (__le32_to_cpu(sb->level) >= 0) {
+               int ddsks=0;
+               switch(__le32_to_cpu(sb->level)) {
+               case 1: ddsks=1;break;
+               case 4:
+               case 5: ddsks = sb->raid_disks-1; break;
+               case 6: ddsks = sb->raid_disks-2; break;
+               case 10: ddsks = sb->raid_disks / (sb->layout&255) / ((sb->layout>>8)&255);
+               }
+               if (ddsks)
+                       printf("     Array Size : %llu%s\n", ddsks*(unsigned long long)sb->size, human_size(ddsks*sb->size<<9));
+               if (sb->size != sb->data_size)
+                       printf("      Used Size : %llu%s\n", (unsigned long long)sb->size, human_size(sb->size<<9));
+       }
        if (sb->data_offset)
                printf("    Data Offset : %llu sectors\n", (unsigned long long)__le64_to_cpu(sb->data_offset));
        if (sb->super_offset)
@@ -171,6 +191,39 @@ static void examine_super1(void *sbv)
                printf("%02x", sb->device_uuid[i]);
        }
        printf("\n");
+       printf("\n");
+       if (sb->feature_map & __le32_to_cpu(MD_FEATURE_RESHAPE_ACTIVE)) {
+               printf("  Reshape pos'n : %llu%s\n", __le64_to_cpu(sb->reshape_position)/2,
+                      human_size(__le64_to_cpu(sb->reshape_position)<<9));
+               if (__le32_to_cpu(sb->delta_disks)) {
+                       printf("  Delta Devices : %d", __le32_to_cpu(sb->delta_disks));
+                       if (__le32_to_cpu(sb->delta_disks))
+                               printf(" (%d->%d)\n",
+                                      __le32_to_cpu(sb->raid_disks)-__le32_to_cpu(sb->delta_disks),
+                                      __le32_to_cpu(sb->raid_disks));
+                       else
+                               printf(" (%d->%d)\n", __le32_to_cpu(sb->raid_disks),
+                                      __le32_to_cpu(sb->raid_disks)+__le32_to_cpu(sb->delta_disks));
+               }
+               if (__le32_to_cpu(sb->new_level) != __le32_to_cpu(sb->level)) {
+                       c = map_num(pers, __le32_to_cpu(sb->new_level));
+                       printf("      New Level : %s\n", c?c:"-unknown-");
+               }
+               if (__le32_to_cpu(sb->new_layout) != __le32_to_cpu(sb->layout)) {
+                       if (__le32_to_cpu(sb->level) == 5) {
+                               c = map_num(r5layout, __le32_to_cpu(sb->new_layout));
+                               printf("     New Layout : %s\n", c?c:"-unknown-");
+                       }
+                       if (__le32_to_cpu(sb->level) == 10) {
+                               printf("     New Layout : near=%d, far=%d\n",
+                                      __le32_to_cpu(sb->new_layout)&255,
+                                      (__le32_to_cpu(sb->new_layout)>>8)&255);
+                       }
+               }
+               if (__le32_to_cpu(sb->new_chunk) != __le32_to_cpu(sb->chunksize))
+                       printf("  New Chunksize : %dK\n", __le32_to_cpu(sb->new_chunk)/2);
+               printf("\n");
+       }
        if (sb->devflags) {
                printf("      Flags :");
                if (sb->devflags & WriteMostly1)
@@ -203,10 +256,10 @@ static void examine_super1(void *sbv)
        case 5:
        case 6:
        case 10:
-               printf("     Chunk Size : %dK\n", __le32_to_cpu(sb->chunksize/2));
+               printf("     Chunk Size : %dK\n", __le32_to_cpu(sb->chunksize)/2);
                break;
        case -1:
-               printf("       Rounding : %dK\n", __le32_to_cpu(sb->chunksize/2));
+               printf("       Rounding : %dK\n", __le32_to_cpu(sb->chunksize)/2);
                break;
        default: break;
        }