X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Detail.c;h=d322732c4222433092997ad45072bc3c2924f48a;hp=c8992ccc881d0fee46a6938044b9d258b29c15e4;hb=16c6fa807c1e43a1a12bbeb7668b4166d14b2cc8;hpb=182661f4097636eb5578ca1d8291880114f15ad0 diff --git a/Detail.c b/Detail.c index c8992ccc..d322732c 100644 --- a/Detail.c +++ b/Detail.c @@ -41,6 +41,8 @@ int Detail(char *dev, int brief, int test) int fd = open(dev, O_RDONLY, 0); int vers; mdu_array_info_t array; + mdu_disk_info_t *disks; + int next; int d; time_t atime; char *c; @@ -50,9 +52,10 @@ int Detail(char *dev, int brief, int test) int is_26 = get_linux_version() >= 2006000; int is_rebuilding = 0; int failed = 0; + struct supertype *st = NULL; + int max_disks = MD_SB_DISKS; - mdp_super_t super; - int have_super = 0; + void *super = NULL; int rv = test ? 4 : 1; if (fd < 0) { @@ -83,12 +86,16 @@ int Detail(char *dev, int brief, int test) close(fd); return rv; } + st = super_by_version(array.major_version, array.minor_version); + if (fstat(fd, &stb) != 0 && !S_ISBLK(stb.st_mode)) stb.st_rdev = 0; rv = 0; + if (st) max_disks = st->max_devs; + /* try to load a superblock */ - for (d= 0; d=0 && - load_super(fd2, &super) ==0 && - (unsigned long)super.ctime == (unsigned long)array.ctime && - (unsigned int)super.level == (unsigned int)array.level) - have_super = 1; + int fd2 = dev_open(dv, O_RDONLY); + if (fd2 >=0 && st && + st->ss->load_super(st, fd2, &super, NULL) == 0) { + struct mdinfo info; + st->ss->getinfo_super(&info, super); + if (info.array.ctime != array.ctime || + info.array.level != array.level) { + free(super); + super = NULL; + } + } if (fd2 >= 0) close(fd2); } } @@ -119,12 +131,13 @@ int Detail(char *dev, int brief, int test) if (brief) printf("ARRAY %s level=%s num-devices=%d", dev, c?c:"-unknown-",array.raid_disks ); else { + mdu_bitmap_file_t bmf; unsigned long array_size; unsigned long long larray_size; - struct mdstat_ent *ms = mdstat_read(0); + struct mdstat_ent *ms = mdstat_read(0, 0); struct mdstat_ent *e; int devnum = array.md_minor; - if (MAJOR(stb.st_rdev) != MD_MAJOR) + if (major(stb.st_rdev) != MD_MAJOR) devnum = -1 - devnum; for (e=ms; e; e=e->next) @@ -150,14 +163,29 @@ int Detail(char *dev, int brief, int test) printf(" Raid Level : %s\n", c?c:"-unknown-"); if (larray_size) printf(" Array Size : %llu%s\n", (larray_size>>10), human_size(larray_size)); - if (array.level >= 1) - printf(" Device Size : %d%s\n", array.size, human_size((long long)array.size<<10)); + if (array.level >= 1) { + if (array.major_version != 0 && + (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)); + else + printf(" Device Size : unknown\n"); + } else + 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(" Persistence : Superblock is %spersistent\n", array.not_persistent?"not ":""); printf("\n"); + if (ioctl(fd, GET_BITMAP_FILE, &bmf) == 0 && + bmf.pathname[0]) { + printf(" Intent Bitmap : %s\n", bmf.pathname); + printf("\n"); + } else if (array.state & (1<= 90) - printf("%08x:%08x:%08x:%08x", super.set_uuid0, super.set_uuid1, - super.set_uuid2, super.set_uuid3); - else - printf("%08x", super.set_uuid0); - printf("\n Events : %d.%d\n\n", super.events_hi, super.events_lo); - } + if (super && st) + st->ss->detail_super(super); printf(" Number Major Minor RaidDevice State\n"); } - for (d= 0; d= 0 && disk.raid_disk < array.raid_disks) + disks[disk.raid_disk] = disk; + else if (next < max_disks) + disks[next++] = disk; + } + + for (d= 0; d < max_disks; d++) { + char *dv; + mdu_disk_info_t disk = disks[d]; + if (d >= array.raid_disks && disk.major == 0 && disk.minor == 0) continue; if (!brief) { - if (disk.number == array.raid_disks) printf("\n"); + if (d == array.raid_disks) printf("\n"); if (disk.raid_disk < 0) printf(" %5d %5d %5d - ", disk.number, disk.major, disk.minor); @@ -241,8 +281,11 @@ int Detail(char *dev, int brief, int test) if (disk.state & (1<= 0) printf(" rebuilding"); @@ -251,8 +294,8 @@ int Detail(char *dev, int brief, int test) * device from the array, and then put it back. * If this fails, we are rebuilding */ - int err = ioctl(fd, HOT_REMOVE_DISK, MKDEV(disk.major, disk.minor)); - if (err == 0) ioctl(fd, HOT_ADD_DISK, MKDEV(disk.major, disk.minor)); + int err = ioctl(fd, HOT_REMOVE_DISK, makedev(disk.major, disk.minor)); + if (err == 0) ioctl(fd, HOT_ADD_DISK, makedev(disk.major, disk.minor)); if (err && errno == EBUSY) printf(" rebuilding"); } @@ -264,7 +307,7 @@ int Detail(char *dev, int brief, int test) rv |= 2; rv |= 1; } - if ((dv=map_dev(disk.major, disk.minor))) { + if ((dv=map_dev(disk.major, disk.minor, 0))) { if (brief) { if (devices) { devices = realloc(devices, @@ -278,15 +321,10 @@ int Detail(char *dev, int brief, int test) if (!brief) printf("\n"); } if (spares && brief) printf(" spares=%d", spares); - if (have_super && brief) { - printf(" UUID="); - if (super.minor_version >= 90) - printf("%08x:%08x:%08x:%08x", super.set_uuid0, super.set_uuid1, - super.set_uuid2, super.set_uuid3); - else - printf("%08x", super.set_uuid0); - } - if (brief && devices) printf("\n devices=%s", devices); + if (super && brief && st) + st->ss->brief_detail_super(super); + + if (brief > 1 && devices) printf("\n devices=%s", devices); if (brief) printf("\n"); if (test && (rv&2)) rv &= ~1; close(fd);