X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Detail.c;h=d7e886a77bc1e43309e2a03424b7744db744e0b2;hb=9cd39f015558dba82c293a4433b481b921ceec87;hp=5bd2dc641ff7d9618f3b500930e7c679c080eb94;hpb=9da5a4897d392b4489689f548ea2b865e6f4b6e2;p=thirdparty%2Fmdadm.git diff --git a/Detail.c b/Detail.c index 5bd2dc64..d7e886a7 100644 --- a/Detail.c +++ b/Detail.c @@ -107,9 +107,17 @@ int Detail(char *dev, struct context *c) external = (sra != NULL && sra->array.major_version == -1 && sra->array.minor_version == -2); st = super_by_fd(fd, &subarray); - if (ioctl(fd, GET_ARRAY_INFO, &array) == 0) { + if (md_get_array_info(fd, &array) == 0) { inactive = 0; } else if (errno == ENODEV && sra) { + if (sra->array.major_version == -1 && + sra->array.minor_version == -1 && + sra->devs == NULL) { + pr_err("Array associated with md device %s does not exist.\n", dev); + close(fd); + sysfs_free(sra); + return rv; + } array = sra->array; inactive = 1; } else { @@ -130,7 +138,7 @@ int Detail(char *dev, struct context *c) /* This is a subarray of some container. * We want the name of the container, and the member */ - int devid = devnm2devid(st->container_devnm); + dev_t devid = devnm2devid(st->container_devnm); int cfd, err; member = subarray; @@ -323,10 +331,12 @@ int Detail(char *dev, struct context *c) if (disk.major == 0 && disk.minor == 0) continue; if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks - && disks[disk.raid_disk*2].state == (1<= 0 && disk.raid_disk < array.raid_disks - && disks[disk.raid_disk*2+1].state == (1<array.major_version < 0) - printf(" Version : %s\n", sra->text_version); + printf(" Version : %s\n", sra->text_version); else - printf(" Version : %d.%d\n", + printf(" Version : %d.%d\n", array.major_version, array.minor_version); } atime = array.ctime; if (atime) - printf(" Creation Time : %.24s\n", ctime(&atime)); + printf(" Creation Time : %.24s\n", ctime(&atime)); if (array.raid_disks == 0 && external) str = "container"; if (str) - printf(" Raid Level : %s\n", str); + printf(" Raid Level : %s\n", str); if (larray_size) - printf(" Array Size : %llu%s\n", (larray_size>>10), + printf(" Array Size : %llu%s\n", (larray_size>>10), human_size(larray_size)); if (array.level >= 1) { if (sra) @@ -418,37 +429,38 @@ int Detail(char *dev, struct context *c) (larray_size >= 0xFFFFFFFFULL|| array.size == 0)) { unsigned long long dsize = get_component_size(fd); if (dsize > 0) - printf(" Used Dev Size : %llu%s\n", + printf(" Used Dev Size : %llu%s\n", dsize/2, human_size((long long)dsize<<9)); else - printf(" Used Dev Size : unknown\n"); + printf(" Used Dev Size : unknown\n"); } else - printf(" Used Dev Size : %d%s\n", array.size, - human_size((long long)array.size<<10)); + printf(" Used Dev Size : %lu%s\n", + (unsigned long)array.size, + human_size((unsigned long long)array.size<<10)); } if (array.raid_disks) - printf(" Raid Devices : %d\n", array.raid_disks); - printf(" Total Devices : %d\n", array.nr_disks); + printf(" Raid Devices : %d\n", array.raid_disks); + printf(" Total Devices : %d\n", array.nr_disks); if (!container && ((sra == NULL && array.major_version == 0) || (sra && sra->array.major_version == 0))) - printf("Preferred Minor : %d\n", array.md_minor); + printf(" Preferred Minor : %d\n", array.md_minor); if (sra == NULL || sra->array.major_version >= 0) - printf(" Persistence : Superblock is %spersistent\n", + printf(" Persistence : Superblock is %spersistent\n", array.not_persistent?"not ":""); printf("\n"); /* Only try GET_BITMAP_FILE for 0.90.01 and later */ if (vers >= 9001 && ioctl(fd, GET_BITMAP_FILE, &bmf) == 0 && bmf.pathname[0]) { - printf(" Intent Bitmap : %s\n", bmf.pathname); + printf(" Intent Bitmap : %s\n", bmf.pathname); printf("\n"); } else if (array.state & (1<percent < 0 && e->percent != RESYNC_PENDING && e->percent != RESYNC_DELAYED)) ? "" : sync_action[e->resync], @@ -470,27 +482,27 @@ int Detail(char *dev, struct context *c) (e && e->percent == RESYNC_DELAYED) ? " (DELAYED)": "", (e && e->percent == RESYNC_PENDING) ? " (PENDING)": ""); } else if (inactive) { - printf(" State : inactive\n"); + printf(" State : inactive\n"); } if (array.raid_disks) - printf(" Active Devices : %d\n", array.active_disks); + printf(" Active Devices : %d\n", array.active_disks); if (array.working_disks > 0) - printf("Working Devices : %d\n", array.working_disks); + printf(" Working Devices : %d\n", array.working_disks); if (array.raid_disks) { - printf(" Failed Devices : %d\n", array.failed_disks); - printf(" Spare Devices : %d\n", array.spare_disks); + printf(" Failed Devices : %d\n", array.failed_disks); + printf(" Spare Devices : %d\n", array.spare_disks); } printf("\n"); if (array.level == 5) { str = map_num(r5layout, array.layout); - printf(" Layout : %s\n", str?str:"-unknown-"); + printf(" Layout : %s\n", str?str:"-unknown-"); } if (array.level == 6) { str = map_num(r6layout, array.layout); - printf(" Layout : %s\n", str?str:"-unknown-"); + printf(" Layout : %s\n", str?str:"-unknown-"); } if (array.level == 10) { - printf(" Layout :"); + printf(" Layout :"); print_r10_layout(array.layout); printf("\n"); } @@ -501,20 +513,35 @@ int Detail(char *dev, struct context *c) case 10: case 6: if (array.chunk_size) - printf(" Chunk Size : %dK\n\n", + printf(" Chunk Size : %dK\n\n", array.chunk_size/1024); break; case -1: - printf(" Rounding : %dK\n\n", array.chunk_size/1024); + printf(" Rounding : %dK\n\n", + array.chunk_size/1024); break; default: break; } + if (array.raid_disks) { + struct mdinfo *mdi = sysfs_read(fd, NULL, + GET_CONSISTENCY_POLICY); + if (mdi) { + char *policy = map_num(consistency_policies, + mdi->consistency_policy); + sysfs_free(mdi); + if (policy) + printf("Consistency Policy : %s\n\n", + policy); + } + } + if (e && e->percent >= 0) { static char *sync_action[] = { "Rebuild", "Resync", "Reshape", "Check"}; - printf(" %7s Status : %d%% complete\n", sync_action[e->resync], e->percent); + printf(" %7s Status : %d%% complete\n", + sync_action[e->resync], e->percent); is_rebuilding = 1; } free_mdstat(ms); @@ -522,39 +549,41 @@ int Detail(char *dev, struct context *c) if ((st && st->sb) && (info && info->reshape_active)) { #if 0 This is pretty boring - printf(" Reshape pos'n : %llu%s\n", (unsigned long long) info->reshape_progress<<9, + printf(" Reshape pos'n : %llu%s\n", + (unsigned long long) info->reshape_progress<<9, human_size((unsigned long long)info->reshape_progress<<9)); #endif if (info->delta_disks != 0) - printf(" Delta Devices : %d, (%d->%d)\n", + printf(" Delta Devices : %d, (%d->%d)\n", info->delta_disks, array.raid_disks - info->delta_disks, array.raid_disks); if (info->new_level != array.level) { str = map_num(pers, info->new_level); - printf(" New Level : %s\n", str?str:"-unknown-"); + printf(" New Level : %s\n", str?str:"-unknown-"); } if (info->new_level != array.level || info->new_layout != array.layout) { if (info->new_level == 5) { str = map_num(r5layout, info->new_layout); - printf(" New Layout : %s\n", + printf(" New Layout : %s\n", str?str:"-unknown-"); } if (info->new_level == 6) { str = map_num(r6layout, info->new_layout); - printf(" New Layout : %s\n", + printf(" New Layout : %s\n", str?str:"-unknown-"); } if (info->new_level == 10) { - printf(" New Layout : near=%d, %s=%d\n", + printf(" New Layout : near=%d, %s=%d\n", info->new_layout&255, (info->new_layout&0x10000)?"offset":"far", (info->new_layout>>8)&255); } } if (info->new_chunk != array.chunk_size) - printf(" New Chunksize : %dK\n", info->new_chunk/1024); + printf(" New Chunksize : %dK\n", + info->new_chunk/1024); printf("\n"); } else if (e && e->percent >= 0) printf("\n"); @@ -569,18 +598,18 @@ This is pretty boring DIR *dir = opendir("/sys/block"); struct dirent *de; - printf(" Member Arrays :"); + printf(" Member Arrays :"); while (dir && (de = readdir(dir)) != NULL) { - char path[200]; + char path[287]; char vbuf[1024]; int nlen = strlen(sra->sys_name); - int devid; + dev_t devid; if (de->d_name[0] == '.') continue; sprintf(path, "/sys/block/%s/md/metadata_version", de->d_name); - if (load_sys(path, vbuf) < 0) + if (load_sys(path, vbuf, sizeof(vbuf)) < 0) continue; if (strncmp(vbuf, "external:", 9) != 0 || !is_subarray(vbuf+9) || @@ -618,10 +647,10 @@ This is pretty boring continue; if (!c->brief) { if (d == array.raid_disks*2) printf("\n"); - if (disk.number < 0) + if (disk.number < 0 && disk.raid_disk < 0) printf(" - %5d %5d - ", disk.major, disk.minor); - else if (disk.raid_disk < 0) + else if (disk.raid_disk < 0 || disk.state & (1<