mdadm-0.8.2

[thirdparty/mdadm.git] / Detail.c

diff --git a/Detail.c b/Detail.c
index 232b458a7dd0ee969fe65759881a404be7d0b28a..55e6eb0d3057bab9536bf11c3c507a1f4838efc7 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -79,26 +79,36 @@ int Detail(char *dev, int brief)
        /* Ok, we have some info to print... */
        c = map_num(pers, array.level);
        if (brief) 
-               printf("ARRAY %s level=%s disks=%d", dev, c?c:"-unknown-",array.raid_disks );
+               printf("ARRAY %s level=%s num-devices=%d", dev, c?c:"-unknown-",array.raid_disks );
        else {
-               int array_size;
-               if (ioctl(fd, BLKGETSIZE, &array_size))
-                       array_size = 0;
-               else array_size>>= 1;
+               unsigned long array_size;
+               unsigned long long larray_size;
+#ifdef BLKGETSIZE64
+               if (ioctl(fd, BLKGETSIZE64, &larray_size)==0)
+                       ;
+               else
+#endif
+                       if (ioctl(fd, BLKGETSIZE, &array_size)==0) {
+                               larray_size = array_size;
+                               larray_size <<= 9;
+                       }
+               
+               else larray_size = 0;
+
                printf("%s:\n", dev);
                printf("        Version : %02d.%02d.%02d\n",
                       array.major_version, array.minor_version, array.patch_version);
                atime = array.ctime;
                printf("  Creation Time : %.24s\n", ctime(&atime));
                printf("     Raid Level : %s\n", c?c:"-unknown-");
-               if (array_size)
-               printf("     Array Size : %d%s\n", array_size, human_size(array_size));
+               if (larray_size)
+               printf("     Array Size : %ld%s\n", (long)(larray_size>>10), human_size(larray_size));
                if (array.level >= 1)
-                       printf("    Device Size : %d%s\n", array.size, human_size(array.size));
-               printf("     Raid Disks : %d\n", array.raid_disks);
-               printf("    Total Disks : %d\n", array.nr_disks);
+                       printf("    Device 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);
                printf("Preferred Minor : %d\n", array.md_minor);
-               printf("    Persistance : Superblock is %spersistant\n",
+               printf("    Persistence : Superblock is %spersistent\n",
                       array.not_persistent?"not ":"");
                printf("\n");
                atime = array.utime;
@@ -106,10 +116,10 @@ int Detail(char *dev, int brief)
                printf("          State : %s, %serrors\n",
                       (array.state&(1<<MD_SB_CLEAN))?"clean":"dirty",
                       (array.state&(1<<MD_SB_ERRORS))?"":"no-");
-               printf("  Active Drives : %d\n", array.active_disks);
-               printf(" Working Drives : %d\n", array.working_disks);
-               printf("  Failed Drives : %d\n", array.failed_disks);
-               printf("   Spare Drives : %d\n", array.spare_disks);
+               printf(" Active Devices : %d\n", array.active_disks);
+               printf("Working Devices : %d\n", array.working_disks);
+               printf(" Failed Devices : %d\n", array.failed_disks);
+               printf("  Spare Devices : %d\n", array.spare_disks);
                printf("\n");
                if (array.level == 5) {
                        c = map_num(r5layout, array.layout);
@@ -128,17 +138,22 @@ int Detail(char *dev, int brief)
                }
        
                printf("\n");
-               printf("    Number   Major   Minor   RaidDisk   State\n");
+               printf("    Number   Major   Minor   RaidDevice State\n");
        }
-       for (d= 0; d<array.raid_disks+array.spare_disks; d++) {
+       for (d= 0; d<MD_SB_DISKS; d++) {
                mdu_disk_info_t disk;
                char *dv;
                disk.number = d;
                if (ioctl(fd, GET_DISK_INFO, &disk) < 0) {
-                       fprintf(stderr, Name ": cannot get disk detail for disk %d: %s\n",
-                               d, strerror(errno));
+                       if (d < array.raid_disks)
+                               fprintf(stderr, Name ": cannot get device detail for device %d: %s\n",
+                                       d, strerror(errno));
                        continue;
                }
+               if (d >= array.raid_disks &&
+                   disk.major == 0 &&
+                   disk.minor == 0)
+                       continue;
                if (!brief) {
                        printf("   %5d   %5d    %5d    %5d     ", 
                               disk.number, disk.major, disk.minor, disk.raid_disk);