X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Grow.c;h=764374fc2da4f38a3672389b6ed9dffad5614612;hp=d9db00be18638bcafd41d62e9c56d3c310ef4f68;hb=45c43276d02a32876c7e1f9f0d04580595141b3d;hpb=ad2f4646023474c59adb448a096d4b02ce33298f diff --git a/Grow.c b/Grow.c old mode 100755 new mode 100644 index d9db00be..764374fc --- a/Grow.c +++ b/Grow.c @@ -58,9 +58,8 @@ int restore_backup(struct supertype *st, for (dev = content->devs; dev; dev = dev->next) { char buf[22]; int fd; - sprintf(buf, "%d:%d", - dev->disk.major, - dev->disk.minor); + + sprintf(buf, "%d:%d", dev->disk.major, dev->disk.minor); fd = dev_open(buf, O_RDWR); if (dev->disk.raid_disk >= 0) @@ -109,13 +108,13 @@ int Grow_Add_device(char *devname, int fd, char *newdev) */ struct mdinfo info; - struct stat stb; + dev_t rdev; int nfd, fd2; int d, nd; struct supertype *st = NULL; char *subarray = NULL; - if (ioctl(fd, GET_ARRAY_INFO, &info.array) < 0) { + if (md_get_array_info(fd, &info.array) < 0) { pr_err("cannot get array info for %s\n", devname); return 1; } @@ -145,9 +144,7 @@ int Grow_Add_device(char *devname, int fd, char *newdev) free(st); return 1; } - fstat(nfd, &stb); - if ((stb.st_mode & S_IFMT) != S_IFBLK) { - pr_err("%s is not a block device!\n", newdev); + if (!fstat_is_blkdev(nfd, newdev, &rdev)) { close(nfd); free(st); return 1; @@ -161,17 +158,15 @@ int Grow_Add_device(char *devname, int fd, char *newdev) st->ss->free_super(st); disk.number = d; - if (ioctl(fd, GET_DISK_INFO, &disk) < 0) { - pr_err("cannot get device detail for device %d\n", - d); + if (md_get_disk_info(fd, &disk) < 0) { + pr_err("cannot get device detail for device %d\n", d); close(nfd); free(st); return 1; } dv = map_dev(disk.major, disk.minor, 1); if (!dv) { - pr_err("cannot find device file for device %d\n", - d); + pr_err("cannot find device file for device %d\n", d); close(nfd); free(st); return 1; @@ -198,16 +193,14 @@ int Grow_Add_device(char *devname, int fd, char *newdev) */ info.disk.number = d; - info.disk.major = major(stb.st_rdev); - info.disk.minor = minor(stb.st_rdev); + info.disk.major = major(rdev); + info.disk.minor = minor(rdev); info.disk.raid_disk = d; info.disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE); - st->ss->update_super(st, &info, "linear-grow-new", newdev, - 0, 0, NULL); + st->ss->update_super(st, &info, "linear-grow-new", newdev, 0, 0, NULL); if (st->ss->store_super(st, nfd)) { - pr_err("Cannot store new superblock on %s\n", - newdev); + pr_err("Cannot store new superblock on %s\n", newdev); close(nfd); return 1; } @@ -221,7 +214,7 @@ int Grow_Add_device(char *devname, int fd, char *newdev) * Now go through and update all superblocks */ - if (ioctl(fd, GET_ARRAY_INFO, &info.array) < 0) { + if (md_get_array_info(fd, &info.array) < 0) { pr_err("cannot get array info for %s\n", devname); return 1; } @@ -232,15 +225,13 @@ int Grow_Add_device(char *devname, int fd, char *newdev) char *dv; disk.number = d; - if (ioctl(fd, GET_DISK_INFO, &disk) < 0) { - pr_err("cannot get device detail for device %d\n", - d); + if (md_get_disk_info(fd, &disk) < 0) { + pr_err("cannot get device detail for device %d\n", d); return 1; } dv = map_dev(disk.major, disk.minor, 1); if (!dv) { - pr_err("cannot find device file for device %d\n", - d); + pr_err("cannot find device file for device %d\n", d); return 1; } fd2 = dev_open(dv, O_RDWR); @@ -251,6 +242,7 @@ int Grow_Add_device(char *devname, int fd, char *newdev) if (st->ss->load_super(st, fd2, NULL)) { pr_err("cannot find super block on %s\n", dv); close(fd); + close(fd2); return 1; } info.array.raid_disks = nd+1; @@ -288,14 +280,8 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s) struct supertype *st; char *subarray = NULL; int major = BITMAP_MAJOR_HI; - int vers = md_get_version(fd); unsigned long long bitmapsize, array_size; - - if (vers < 9003) { - major = BITMAP_MAJOR_HOSTENDIAN; - pr_err("Warning - bitmaps created on this kernel are not portable\n" - " between different architectures. Consider upgrading the Linux kernel.\n"); - } + struct mdinfo *mdi; /* * We only ever get called if s->bitmap_file is != NULL, so this check @@ -315,27 +301,26 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s) return 1; } if (bmf.pathname[0]) { - if (strcmp(s->bitmap_file,"none")==0) { - if (ioctl(fd, SET_BITMAP_FILE, -1)!= 0) { + if (strcmp(s->bitmap_file,"none") == 0) { + if (ioctl(fd, SET_BITMAP_FILE, -1) != 0) { pr_err("failed to remove bitmap %s\n", bmf.pathname); return 1; } return 0; } - pr_err("%s already has a bitmap (%s)\n", - devname, bmf.pathname); + pr_err("%s already has a bitmap (%s)\n", devname, bmf.pathname); return 1; } - if (ioctl(fd, GET_ARRAY_INFO, &array) != 0) { + if (md_get_array_info(fd, &array) != 0) { pr_err("cannot get array status for %s\n", devname); return 1; } - if (array.state & (1<bitmap_file, "none")==0) { - array.state &= ~(1< (0x7fffffffULL<<9)) { + array_size > (0x7fffffffULL << 9)) { /* Array is big enough that we cannot trust array.size * try other approaches */ @@ -371,8 +356,16 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s) } if (array.level == 10) { - int ncopies = (array.layout&255)*((array.layout>>8)&255); + int ncopies; + + ncopies = (array.layout & 255) * ((array.layout >> 8) & 255); bitmapsize = bitmapsize * array.raid_disks / ncopies; + + if (strcmp(s->bitmap_file, "clustered") == 0 && + !is_near_layout_10(array.layout)) { + pr_err("only near layout is supported with clustered raid10\n"); + return 1; + } } st = super_by_fd(fd, &subarray); @@ -387,12 +380,23 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s) free(st); return 1; } + + mdi = sysfs_read(fd, NULL, GET_CONSISTENCY_POLICY); + if (mdi) { + if (mdi->consistency_policy == CONSISTENCY_POLICY_PPL) { + pr_err("Cannot add bitmap to array with PPL\n"); + free(mdi); + free(st); + return 1; + } + free(mdi); + } + if (strcmp(s->bitmap_file, "internal") == 0 || strcmp(s->bitmap_file, "clustered") == 0) { int rv; int d; int offset_setable = 0; - struct mdinfo *mdi; if (st->ss->add_internal_bitmap == NULL) { pr_err("Internal bitmaps not supported with %s metadata\n", st->ss->name); return 1; @@ -402,49 +406,57 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s) mdi = sysfs_read(fd, NULL, GET_BITMAP_LOCATION); if (mdi) offset_setable = 1; - for (d=0; d< st->max_devs; d++) { + for (d = 0; d < st->max_devs; d++) { mdu_disk_info_t disk; char *dv; + int fd2; + disk.number = d; - if (ioctl(fd, GET_DISK_INFO, &disk) < 0) + if (md_get_disk_info(fd, &disk) < 0) continue; - if (disk.major == 0 && - disk.minor == 0) + if (disk.major == 0 && disk.minor == 0) continue; - if ((disk.state & (1<ss->load_super(st, fd2, NULL)==0) { - if (st->ss->add_internal_bitmap( - st, - &s->bitmap_chunk, c->delay, s->write_behind, - bitmapsize, offset_setable, - major) - ) - st->ss->write_bitmap(st, fd2, NoUpdate); - else { - pr_err("failed to create internal bitmap - chunksize problem.\n"); - close(fd2); - return 1; - } + if (!dv) + continue; + fd2 = dev_open(dv, O_RDWR); + if (fd2 < 0) + continue; + rv = st->ss->load_super(st, fd2, NULL); + if (!rv) { + rv = st->ss->add_internal_bitmap( + st, &s->bitmap_chunk, c->delay, + s->write_behind, bitmapsize, + offset_setable, major); + if (!rv) { + st->ss->write_bitmap(st, fd2, + NodeNumUpdate); + } else { + pr_err("failed to create internal bitmap - chunksize problem.\n"); } - close(fd2); + } else { + pr_err("failed to load super-block.\n"); } + close(fd2); + if (rv) + return 1; } if (offset_setable) { st->ss->getinfo_super(st, mdi, NULL); - sysfs_init(mdi, fd, NULL); + if (sysfs_init(mdi, fd, NULL)) { + pr_err("failed to initialize sysfs.\n"); + free(mdi); + } rv = sysfs_set_num_signed(mdi, NULL, "bitmap/location", mdi->bitmap_offset); + free(mdi); } else { if (strcmp(s->bitmap_file, "clustered") == 0) - array.state |= (1<bitmap_file, c->force, (char*)uuid, s->bitmap_chunk, - c->delay, s->write_behind, bitmapsize, major)) { + if (CreateBitmap(s->bitmap_file, c->force, (char*)uuid, + s->bitmap_chunk, c->delay, s->write_behind, + bitmapsize, major)) { return 1; } bitmap_fd = open(s->bitmap_file, O_RDWR); if (bitmap_fd < 0) { - pr_err("weird: %s cannot be opened\n", - s->bitmap_file); + pr_err("weird: %s cannot be opened\n", s->bitmap_file); return 1; } if (ioctl(fd, SET_BITMAP_FILE, bitmap_fd) < 0) { @@ -509,6 +521,190 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s) return 0; } +int Grow_consistency_policy(char *devname, int fd, struct context *c, struct shape *s) +{ + struct supertype *st; + struct mdinfo *sra; + struct mdinfo *sd; + char *subarray = NULL; + int ret = 0; + char container_dev[PATH_MAX]; + char buf[20]; + + if (s->consistency_policy != CONSISTENCY_POLICY_RESYNC && + s->consistency_policy != CONSISTENCY_POLICY_PPL) { + pr_err("Operation not supported for consistency policy %s\n", + map_num(consistency_policies, s->consistency_policy)); + return 1; + } + + st = super_by_fd(fd, &subarray); + if (!st) + return 1; + + sra = sysfs_read(fd, NULL, GET_CONSISTENCY_POLICY|GET_LEVEL| + GET_DEVS|GET_STATE); + if (!sra) { + ret = 1; + goto free_st; + } + + if (s->consistency_policy == CONSISTENCY_POLICY_PPL && + !st->ss->write_init_ppl) { + pr_err("%s metadata does not support PPL\n", st->ss->name); + ret = 1; + goto free_info; + } + + if (sra->array.level != 5) { + pr_err("Operation not supported for array level %d\n", + sra->array.level); + ret = 1; + goto free_info; + } + + if (sra->consistency_policy == (unsigned)s->consistency_policy) { + pr_err("Consistency policy is already %s\n", + map_num(consistency_policies, s->consistency_policy)); + ret = 1; + goto free_info; + } else if (sra->consistency_policy != CONSISTENCY_POLICY_RESYNC && + sra->consistency_policy != CONSISTENCY_POLICY_PPL) { + pr_err("Current consistency policy is %s, cannot change to %s\n", + map_num(consistency_policies, sra->consistency_policy), + map_num(consistency_policies, s->consistency_policy)); + ret = 1; + goto free_info; + } + + if (s->consistency_policy == CONSISTENCY_POLICY_PPL) { + if (sysfs_get_str(sra, NULL, "sync_action", buf, 20) <= 0) { + ret = 1; + goto free_info; + } else if (strcmp(buf, "reshape\n") == 0) { + pr_err("PPL cannot be enabled when reshape is in progress\n"); + ret = 1; + goto free_info; + } + } + + if (subarray) { + char *update; + + if (s->consistency_policy == CONSISTENCY_POLICY_PPL) + update = "ppl"; + else + update = "no-ppl"; + + sprintf(container_dev, "/dev/%s", st->container_devnm); + + ret = Update_subarray(container_dev, subarray, update, NULL, + c->verbose); + if (ret) + goto free_info; + } + + if (s->consistency_policy == CONSISTENCY_POLICY_PPL) { + struct mdinfo info; + + if (subarray) { + struct mdinfo *mdi; + int cfd; + + cfd = open(container_dev, O_RDWR|O_EXCL); + if (cfd < 0) { + pr_err("Failed to open %s\n", container_dev); + ret = 1; + goto free_info; + } + + ret = st->ss->load_container(st, cfd, st->container_devnm); + close(cfd); + + if (ret) { + pr_err("Cannot read superblock for %s\n", + container_dev); + goto free_info; + } + + mdi = st->ss->container_content(st, subarray); + info = *mdi; + free(mdi); + } + + for (sd = sra->devs; sd; sd = sd->next) { + int dfd; + char *devpath; + + devpath = map_dev(sd->disk.major, sd->disk.minor, 0); + dfd = dev_open(devpath, O_RDWR); + if (dfd < 0) { + pr_err("Failed to open %s\n", devpath); + ret = 1; + goto free_info; + } + + if (!subarray) { + ret = st->ss->load_super(st, dfd, NULL); + if (ret) { + pr_err("Failed to load super-block.\n"); + close(dfd); + goto free_info; + } + + ret = st->ss->update_super(st, sra, "ppl", + devname, + c->verbose, 0, NULL); + if (ret) { + close(dfd); + st->ss->free_super(st); + goto free_info; + } + st->ss->getinfo_super(st, &info, NULL); + } + + ret |= sysfs_set_num(sra, sd, "ppl_sector", + info.ppl_sector); + ret |= sysfs_set_num(sra, sd, "ppl_size", + info.ppl_size); + + if (ret) { + pr_err("Failed to set PPL attributes for %s\n", + sd->sys_name); + close(dfd); + st->ss->free_super(st); + goto free_info; + } + + ret = st->ss->write_init_ppl(st, &info, dfd); + if (ret) + pr_err("Failed to write PPL\n"); + + close(dfd); + + if (!subarray) + st->ss->free_super(st); + + if (ret) + goto free_info; + } + } + + ret = sysfs_set_str(sra, NULL, "consistency_policy", + map_num(consistency_policies, + s->consistency_policy)); + if (ret) + pr_err("Failed to change array consistency policy\n"); + +free_info: + sysfs_free(sra); +free_st: + free(st); + free(subarray); + + return ret; +} + /* * When reshaping an array we might need to backup some data. * This is written to all spares with a 'super_block' describing it. @@ -558,7 +754,8 @@ static int check_idle(struct supertype *st) for (e = ent ; e; e = e->next) { if (!is_container_member(e, container)) continue; - if (e->percent >= 0) { + /* frozen array is not idle*/ + if (e->percent >= 0 || e->metadata_version[9] == '-') { is_idle = 0; break; } @@ -628,8 +825,8 @@ static void unfreeze(struct supertype *st) char buf[20]; if (sra && - sysfs_get_str(sra, NULL, "sync_action", buf, 20) > 0 - && strcmp(buf, "frozen\n") == 0) + sysfs_get_str(sra, NULL, "sync_action", buf, 20) > 0 && + strcmp(buf, "frozen\n") == 0) sysfs_set_str(sra, NULL, "sync_action", "idle"); sysfs_free(sra); } @@ -657,8 +854,7 @@ static int reshape_super(struct supertype *st, unsigned long long size, /* nothing extra to check in the native case */ if (!st->ss->external) return 0; - if (!st->ss->reshape_super || - !st->ss->manage_reshape) { + if (!st->ss->reshape_super || !st->ss->manage_reshape) { pr_err("%s metadata does not support reshape\n", st->ss->name); return 1; @@ -736,7 +932,8 @@ int start_reshape(struct mdinfo *sra, int already_running, if (!already_running && err == 0) { int cnt = 5; do { - err = sysfs_set_str(sra, NULL, "sync_action", "reshape"); + err = sysfs_set_str(sra, NULL, "sync_action", + "reshape"); if (err) sleep(1); } while (err && errno == EBUSY && cnt-- > 0); @@ -771,6 +968,26 @@ int remove_disks_for_takeover(struct supertype *st, struct mdinfo *remaining; int slot; + if (st->ss->external) { + int rv = 0; + struct mdinfo *arrays = st->ss->container_content(st, NULL); + /* + * containter_content returns list of arrays in container + * If arrays->next is not NULL it means that there are + * 2 arrays in container and operation should be blocked + */ + if (arrays) { + if (arrays->next) + rv = 1; + sysfs_free(arrays); + if (rv) { + pr_err("Error. Cannot perform operation on /dev/%s\n", st->devnm); + pr_err("For this operation it MUST be single array in container\n"); + return rv; + } + } + } + if (sra->array.level == 10) nr_of_copies = layout & 0xff; else if (sra->array.level == 1) @@ -875,10 +1092,8 @@ int reshape_prepare_fdlist(char *devname, continue; if (sd->disk.state & (1<disk.raid_disk < raid_disks) { - char *dn = map_dev(sd->disk.major, - sd->disk.minor, 1); - fdlist[sd->disk.raid_disk] - = dev_open(dn, O_RDONLY); + char *dn = map_dev(sd->disk.major, sd->disk.minor, 1); + fdlist[sd->disk.raid_disk] = dev_open(dn, O_RDONLY); offsets[sd->disk.raid_disk] = sd->data_offset*512; if (fdlist[sd->disk.raid_disk] < 0) { pr_err("%s: cannot open component %s\n", @@ -888,8 +1103,7 @@ int reshape_prepare_fdlist(char *devname, } } else if (backup_file == NULL) { /* spare */ - char *dn = map_dev(sd->disk.major, - sd->disk.minor, 1); + char *dn = map_dev(sd->disk.major, sd->disk.minor, 1); fdlist[d] = dev_open(dn, O_RDWR); offsets[d] = (sd->data_offset + sra->component_size - blocks - 8)*512; if (fdlist[d] < 0) { @@ -982,7 +1196,8 @@ unsigned long compute_backup_blocks(int nchunk, int ochunk, /* Find GCD */ a = GCD(a, b); /* LCM == product / GCD */ - blocks = (ochunk/512) * (nchunk/512) * odata * ndata / a; + blocks = (unsigned long)(ochunk/512) * (unsigned long)(nchunk/512) * + odata * ndata / a; return blocks; } @@ -1058,8 +1273,7 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) * raid5 with 2 disks, or * raid0 with 1 disk */ - if (info->new_level > 1 && - (info->component_size & 7)) + if (info->new_level > 1 && (info->component_size & 7)) return "Cannot convert RAID1 of this size - reduce size to multiple of 4K first."; if (info->new_level == 0) { if (info->delta_disks != UnSet && @@ -1077,9 +1291,9 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) re->level = 1; return NULL; } - if (info->array.raid_disks == 2 && - info->new_level == 5) { - + if (info->array.raid_disks != 2 && info->new_level == 5) + return "Can only convert a 2-device array to RAID5"; + if (info->array.raid_disks == 2 && info->new_level == 5) { re->level = 5; re->before.data_disks = 1; if (info->delta_disks != UnSet && @@ -1109,17 +1323,22 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) case 0: if ((info->array.layout & ~0xff) != 0x100) return "Cannot Grow RAID10 with far/offset layout"; - /* number of devices must be multiple of number of copies */ - if (info->array.raid_disks % (info->array.layout & 0xff)) + /* + * number of devices must be multiple of + * number of copies + */ + if (info->array.raid_disks % + (info->array.layout & 0xff)) return "RAID10 layout too complex for Grow operation"; - new_disks = (info->array.raid_disks - / (info->array.layout & 0xff)); + new_disks = (info->array.raid_disks / + (info->array.layout & 0xff)); if (info->delta_disks == UnSet) info->delta_disks = (new_disks - info->array.raid_disks); - if (info->delta_disks != new_disks - info->array.raid_disks) + if (info->delta_disks != + new_disks - info->array.raid_disks) return "New number of raid-devices impossible for RAID10"; if (info->new_chunk && info->new_chunk != info->array.chunk_size) @@ -1190,7 +1409,8 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) case 0: /* RAID0 can be converted to RAID10, or to RAID456 */ if (info->new_level == 10) { - if (info->new_layout == UnSet && info->delta_disks == UnSet) { + if (info->new_layout == UnSet && + info->delta_disks == UnSet) { /* Assume near=2 layout */ info->new_layout = 0x102; info->delta_disks = info->array.raid_disks; @@ -1198,8 +1418,8 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) if (info->new_layout == UnSet) { int copies = 1 + (info->delta_disks / info->array.raid_disks); - if (info->array.raid_disks * (copies-1) - != info->delta_disks) + if (info->array.raid_disks * (copies-1) != + info->delta_disks) return "Impossible number of devices for RAID0->RAID10"; info->new_layout = 0x100 + copies; } @@ -1403,7 +1623,8 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) * can leave it unchanged, else we must * fail */ - ls = map_num(r6layout, info->new_layout); + ls = map_num(r6layout, + info->new_layout); if (!ls || strcmp(ls+strlen(ls)-2, "-6") != 0) return "Please specify new layout"; @@ -1429,16 +1650,19 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) if (info->delta_disks == UnSet) info->delta_disks = delta_parity; - re->after.data_disks = (re->before.data_disks - + info->delta_disks - - delta_parity); + re->after.data_disks = + (re->before.data_disks + info->delta_disks - delta_parity); + switch (re->level) { - case 6: re->parity = 2; + case 6: + re->parity = 2; break; case 4: - case 5: re->parity = 1; + case 5: + re->parity = 1; break; - default: re->parity = 0; + default: + re->parity = 0; break; } /* So we have a restripe operation, we need to calculate the number @@ -1472,8 +1696,7 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) re->backup_blocks = compute_backup_blocks( info->new_chunk, info->array.chunk_size, - re->after.data_disks, - re->before.data_disks); + re->after.data_disks, re->before.data_disks); re->min_offset_change = re->backup_blocks / re->before.data_disks; re->new_size = info->component_size * re->after.data_disks; @@ -1492,12 +1715,11 @@ static int set_array_size(struct supertype *st, struct mdinfo *sra, if (text_version == NULL) text_version = sra->text_version; - subarray = strchr(text_version+1, '/')+1; + subarray = strchr(text_version + 1, '/')+1; info = st->ss->container_content(st, subarray); if (info) { unsigned long long current_size = 0; - unsigned long long new_size = - info->custom_array_size/2; + unsigned long long new_size = info->custom_array_size/2; if (sysfs_get_ll(sra, NULL, "array_size", ¤t_size) == 0 && new_size > current_size) { @@ -1570,13 +1792,18 @@ int Grow_reshape(char *devname, int fd, struct mdinfo info; struct mdinfo *sra; - if (ioctl(fd, GET_ARRAY_INFO, &array) < 0) { + if (md_get_array_info(fd, &array) < 0) { pr_err("%s is not an active md array - aborting\n", devname); return 1; } - if (data_offset != INVALID_SECTORS && array.level != 10 - && (array.level < 4 || array.level > 6)) { + if (s->level != UnSet && s->chunk) { + pr_err("Cannot change array level in the same operation as changing chunk size.\n"); + return 1; + } + + if (data_offset != INVALID_SECTORS && array.level != 10 && + (array.level < 4 || array.level > 6)) { pr_err("--grow --data-offset not yet supported\n"); return 1; } @@ -1588,14 +1815,20 @@ int Grow_reshape(char *devname, int fd, return 1; } - if (s->raiddisks && s->raiddisks < array.raid_disks && array.level > 1 && - get_linux_version() < 2006032 && + if (s->raiddisks && s->raiddisks < array.raid_disks && + array.level > 1 && get_linux_version() < 2006032 && !check_env("MDADM_FORCE_FEWER")) { pr_err("reducing the number of devices is not safe before Linux 2.6.32\n" " Please use a newer kernel\n"); return 1; } + if (array.level > 1 && s->size > 1 && + (unsigned long long) (array.chunk_size / 1024) > s->size) { + pr_err("component size must be larger than chunk size.\n"); + return 1; + } + st = super_by_fd(fd, &subarray); if (!st) { pr_err("Unable to determine metadata format for %s\n", devname); @@ -1609,7 +1842,7 @@ int Grow_reshape(char *devname, int fd, (array.state & (1<ss->external) { - int rv; + int retval; if (subarray) { container = st->container_devnm; @@ -1632,17 +1865,15 @@ int Grow_reshape(char *devname, int fd, fd = cfd; } if (cfd < 0) { - pr_err("Unable to open container for %s\n", - devname); + pr_err("Unable to open container for %s\n", devname); free(subarray); return 1; } - rv = st->ss->load_container(st, cfd, NULL); + retval = st->ss->load_container(st, cfd, NULL); - if (rv) { - pr_err("Cannot read superblock for %s\n", - devname); + if (retval) { + pr_err("Cannot read superblock for %s\n", devname); free(subarray); return 1; } @@ -1659,10 +1890,11 @@ int Grow_reshape(char *devname, int fd, /* check if reshape is allowed based on metadata * indications stored in content.array.status */ - if (content->array.state & (1<array.state & + (1 << MD_SB_BLOCK_VOLUME)) allow_reshape = 0; - if (content->array.state - & (1<array.state & + (1 << MD_SB_BLOCK_CONTAINER_RESHAPE)) allow_reshape = 0; if (!allow_reshape) { pr_err("cannot reshape arrays in container with unsupported metadata: %s(%s)\n", @@ -1671,6 +1903,13 @@ int Grow_reshape(char *devname, int fd, free(subarray); return 1; } + if (content->consistency_policy == + CONSISTENCY_POLICY_PPL) { + pr_err("Operation not supported when ppl consistency policy is enabled\n"); + sysfs_free(cc); + free(subarray); + return 1; + } } sysfs_free(cc); } @@ -1682,7 +1921,8 @@ int Grow_reshape(char *devname, int fd, for (dv = devlist; dv; dv = dv->next) added_disks++; if (s->raiddisks > array.raid_disks && - array.spare_disks +added_disks < (s->raiddisks - array.raid_disks) && + array.spare_disks + added_disks < + (s->raiddisks - array.raid_disks) && !c->force) { pr_err("Need %d spare%s to avoid degraded array, and only have %d.\n" " Use --force to over-ride this check.\n", @@ -1692,8 +1932,8 @@ int Grow_reshape(char *devname, int fd, return 1; } - sra = sysfs_read(fd, NULL, GET_LEVEL | GET_DISKS | GET_DEVS - | GET_STATE | GET_VERSION); + sra = sysfs_read(fd, NULL, GET_LEVEL | GET_DISKS | GET_DEVS | + GET_STATE | GET_VERSION); if (sra) { if (st->ss->external && subarray == NULL) { array.level = LEVEL_CONTAINER; @@ -1716,7 +1956,8 @@ int Grow_reshape(char *devname, int fd, } /* ========= set size =============== */ - if (s->size > 0 && (s->size == MAX_SIZE || s->size != (unsigned)array.size)) { + if (s->size > 0 && + (s->size == MAX_SIZE || s->size != (unsigned)array.size)) { unsigned long long orig_size = get_component_size(fd)/2; unsigned long long min_csize; struct mdinfo *mdi; @@ -1732,7 +1973,8 @@ int Grow_reshape(char *devname, int fd, } if (reshape_super(st, s->size, UnSet, UnSet, 0, 0, UnSet, NULL, - devname, APPLY_METADATA_CHANGES, c->verbose > 0)) { + devname, APPLY_METADATA_CHANGES, + c->verbose > 0)) { rv = 1; goto release; } @@ -1751,7 +1993,8 @@ int Grow_reshape(char *devname, int fd, sizeinfo->array.layout, sizeinfo->array.raid_disks); new_size /= data_disks; - dprintf("Metadata size correction from %llu to %llu (%llu)\n", orig_size, new_size, + dprintf("Metadata size correction from %llu to %llu (%llu)\n", + orig_size, new_size, new_size * data_disks); s->size = new_size; sysfs_free(sizeinfo); @@ -1764,33 +2007,24 @@ int Grow_reshape(char *devname, int fd, * understands '0' to mean 'max'. */ min_csize = 0; - rv = 0; for (mdi = sra->devs; mdi; mdi = mdi->next) { - if (sysfs_set_num(sra, mdi, "size", - s->size == MAX_SIZE ? 0 : s->size) < 0) { - /* Probably kernel refusing to let us - * reduce the size - not an error. - */ - break; - } + sysfs_set_num(sra, mdi, "size", + s->size == MAX_SIZE ? 0 : s->size); if (array.not_persistent == 0 && array.major_version == 0 && get_linux_version() < 3001000) { /* Dangerous to allow size to exceed 2TB */ unsigned long long csize; - if (sysfs_get_ll(sra, mdi, "size", &csize) == 0) { + if (sysfs_get_ll(sra, mdi, "size", + &csize) == 0) { if (csize >= 2ULL*1024*1024*1024) csize = 2ULL*1024*1024*1024; - if ((min_csize == 0 || (min_csize - > csize))) + if ((min_csize == 0 || + (min_csize > csize))) min_csize = csize; } } } - if (rv) { - pr_err("Cannot set size on array members.\n"); - goto size_change_error; - } if (min_csize && s->size > min_csize) { pr_err("Cannot safely make this array use more than 2TB per device on this kernel.\n"); rv = 1; @@ -1805,14 +2039,13 @@ int Grow_reshape(char *devname, int fd, } if (st->ss->external) { if (sra->array.level == 0) { - rv = sysfs_set_str(sra, NULL, "level", - "raid5"); + rv = sysfs_set_str(sra, NULL, "level", "raid5"); if (!rv) { raid0_takeover = 1; /* get array parameters after takeover * to change one parameter at time only */ - rv = ioctl(fd, GET_ARRAY_INFO, &array); + rv = md_get_array_info(fd, &array); } } /* make sure mdmon is @@ -1838,7 +2071,7 @@ int Grow_reshape(char *devname, int fd, else rv = -1; } else { - rv = ioctl(fd, SET_ARRAY_INFO, &array); + rv = md_set_array_info(fd, &array); /* manage array size when it is managed externally */ @@ -1854,7 +2087,7 @@ int Grow_reshape(char *devname, int fd, /* go back to raid0, drop parity disk */ sysfs_set_str(sra, NULL, "level", "raid0"); - ioctl(fd, GET_ARRAY_INFO, &array); + md_get_array_info(fd, &array); } size_change_error: @@ -1880,10 +2113,11 @@ size_change_error: * a backport has been arranged. */ if (sra == NULL || - sysfs_set_str(sra, NULL, "resync_start", "none") < 0) + sysfs_set_str(sra, NULL, "resync_start", + "none") < 0) pr_err("--assume-clean not supported with --grow on this kernel\n"); } - ioctl(fd, GET_ARRAY_INFO, &array); + md_get_array_info(fd, &array); s->size = get_component_size(fd)/2; if (s->size == 0) s->size = array.size; @@ -1910,8 +2144,7 @@ size_change_error: (s->raiddisks == 0 || s->raiddisks == array.raid_disks)) { /* Nothing more to do */ if (!changed && c->verbose >= 0) - pr_err("%s: no change requested\n", - devname); + pr_err("%s: no change requested\n", devname); goto release; } @@ -1925,6 +2158,7 @@ size_change_error: array.layout == ((1 << 8) + 2) && !(array.raid_disks & 1)) || (s->level == 0 && array.level == 1 && sra)) { int err; + err = remove_disks_for_takeover(st, sra, array.layout); if (err) { dprintf("Array cannot be reshaped\n"); @@ -1943,7 +2177,11 @@ size_change_error: memset(&info, 0, sizeof(info)); info.array = array; - sysfs_init(&info, fd, NULL); + if (sysfs_init(&info, fd, NULL)) { + pr_err("failed to initialize sysfs.\n"); + rv = 1; + goto release; + } strcpy(info.text_version, sra->text_version); info.component_size = s->size*2; info.new_level = s->level; @@ -2049,12 +2287,12 @@ size_change_error: rv =1 ; } if (s->layout_str) { - if (ioctl(fd, GET_ARRAY_INFO, &array) != 0) { + if (md_get_array_info(fd, &array) != 0) { dprintf("Cannot get array information.\n"); goto release; } array.layout = info.new_layout; - if (ioctl(fd, SET_ARRAY_INFO, &array) != 0) { + if (md_set_array_info(fd, &array) != 0) { pr_err("failed to set new layout\n"); rv = 1; } else if (c->verbose >= 0) @@ -2075,7 +2313,8 @@ size_change_error: fd = -1; } rv = reshape_container(container, devname, -1, st, &info, - c->force, c->backup_file, c->verbose, 0, 0, 0); + c->force, c->backup_file, c->verbose, + 0, 0, 0); frozen = 0; } else { /* get spare devices from external metadata @@ -2097,15 +2336,15 @@ size_change_error: if (reshape_super(st, 0, info.new_level, info.new_layout, info.new_chunk, info.array.raid_disks, info.delta_disks, - c->backup_file, devname, APPLY_METADATA_CHANGES, - c->verbose)) { + c->backup_file, devname, + APPLY_METADATA_CHANGES, c->verbose)) { rv = 1; goto release; } sync_metadata(st); rv = reshape_array(container, fd, devname, st, &info, c->force, - devlist, data_offset, c->backup_file, c->verbose, - 0, 0, 0); + devlist, data_offset, c->backup_file, + c->verbose, 0, 0, 0); frozen = 0; } release: @@ -2276,8 +2515,10 @@ static int set_new_data_offset(struct mdinfo *sra, struct supertype *st, dir = -1; else dir = 1; - } else if ((data_offset <= info2.data_offset && dir == 1) || - (data_offset >= info2.data_offset && dir == -1)) { + } else if ((data_offset <= info2.data_offset && + dir == 1) || + (data_offset >= info2.data_offset && + dir == -1)) { pr_err("%s: differing data offsets on devices make this --data-offset setting impossible\n", dn); goto release; @@ -2372,8 +2613,8 @@ static int set_new_data_offset(struct mdinfo *sra, struct supertype *st, goto release; } if (data_offset != INVALID_SECTORS && - data_offset < sd->data_offset - min) { - pr_err("--data-offset too small on %s\n", + data_offset > sd->data_offset - min) { + pr_err("--data-offset too large on %s\n", dn); goto release; } @@ -2402,8 +2643,7 @@ static int set_new_data_offset(struct mdinfo *sra, struct supertype *st, } if (err < 0) { if (errno == E2BIG && data_offset != INVALID_SECTORS) { - pr_err("data-offset is too big for %s\n", - dn); + pr_err("data-offset is too big for %s\n", dn); goto release; } if (sd == sra->devs && @@ -2413,8 +2653,7 @@ static int set_new_data_offset(struct mdinfo *sra, struct supertype *st, * For RAID5/6 this is not fatal */ return 1; - pr_err("Cannot set new_offset for %s\n", - dn); + pr_err("Cannot set new_offset for %s\n", dn); break; } } @@ -2460,8 +2699,7 @@ static int raid10_reshape(char *container, int fd, char *devname, GET_COMPONENT|GET_DEVS|GET_OFFSET|GET_STATE|GET_CHUNK ); if (!sra) { - pr_err("%s: Cannot get array details from sysfs\n", - devname); + pr_err("%s: Cannot get array details from sysfs\n", devname); goto release; } min = reshape->min_offset_change; @@ -2469,18 +2707,16 @@ static int raid10_reshape(char *container, int fd, char *devname, if (info->delta_disks) sysfs_set_str(sra, NULL, "reshape_direction", info->delta_disks < 0 ? "backwards" : "forwards"); - if (info->delta_disks < 0 && - info->space_after < min) { + if (info->delta_disks < 0 && info->space_after < min) { int rv = sysfs_set_num(sra, NULL, "component_size", - (sra->component_size - - min)/2); + (sra->component_size - min)/2); if (rv) { pr_err("cannot reduce component size\n"); goto release; } } - err = set_new_data_offset(sra, st, devname, info->delta_disks, data_offset, - min, 0); + err = set_new_data_offset(sra, st, devname, info->delta_disks, + data_offset, min, 0); if (err == 1) { pr_err("Cannot set new_data_offset: RAID10 reshape not\n"); cont_err("supported on this kernel\n"); @@ -2491,10 +2727,12 @@ static int raid10_reshape(char *container, int fd, char *devname, if (!err && sysfs_set_num(sra, NULL, "chunk_size", info->new_chunk) < 0) err = errno; - if (!err && sysfs_set_num(sra, NULL, "layout", reshape->after.layout) < 0) + if (!err && sysfs_set_num(sra, NULL, "layout", + reshape->after.layout) < 0) err = errno; - if (!err && sysfs_set_num(sra, NULL, "raid_disks", - info->array.raid_disks + info->delta_disks) < 0) + if (!err && + sysfs_set_num(sra, NULL, "raid_disks", + info->array.raid_disks + info->delta_disks) < 0) err = errno; if (!err && sysfs_set_str(sra, NULL, "sync_action", "reshape") < 0) err = errno; @@ -2612,14 +2850,13 @@ static int impose_reshape(struct mdinfo *sra, * reshape->after.data_disks); } - ioctl(fd, GET_ARRAY_INFO, &array); + md_get_array_info(fd, &array); if (info->array.chunk_size == info->new_chunk && reshape->before.layout == reshape->after.layout && st->ss->external == 0) { /* use SET_ARRAY_INFO but only if reshape hasn't started */ array.raid_disks = reshape->after.data_disks + reshape->parity; - if (!restart && - ioctl(fd, SET_ARRAY_INFO, &array) != 0) { + if (!restart && md_set_array_info(fd, &array) != 0) { int err = errno; pr_err("Cannot set device shape for %s: %s\n", @@ -2646,8 +2883,7 @@ static int impose_reshape(struct mdinfo *sra, reshape->parity) < 0) err = errno; if (err) { - pr_err("Cannot set device shape for %s\n", - devname); + pr_err("Cannot set device shape for %s\n", devname); if (err == EBUSY && (array.state & (1<= 4 && array.level <= 6)) { + if (sysfs_init(&info, fd, NULL)) { + pr_err("failed to initialize sysfs.\n"); + return 1; + } + + md_get_array_info(fd, &array); + if (level == 0 && (array.level >= 4 && array.level <= 6)) { /* To convert to RAID0 we need to fail and * remove any non-data devices. */ int found = 0; @@ -2677,57 +2916,46 @@ static int impose_level(int fd, int level, char *devname, int verbose) int data_disks = array.raid_disks - 1; if (array.level == 6) data_disks -= 1; - if (array.level == 5 && - array.layout != ALGORITHM_PARITY_N) + if (array.level == 5 && array.layout != ALGORITHM_PARITY_N) return -1; - if (array.level == 6 && - array.layout != ALGORITHM_PARITY_N_6) + if (array.level == 6 && array.layout != ALGORITHM_PARITY_N_6) return -1; sysfs_set_str(&info, NULL,"sync_action", "idle"); /* First remove any spares so no recovery starts */ for (d = 0, found = 0; - d < MAX_DISKS && found < array.nr_disks; - d++) { + d < MAX_DISKS && found < array.nr_disks; d++) { mdu_disk_info_t disk; disk.number = d; - if (ioctl(fd, GET_DISK_INFO, &disk) < 0) + if (md_get_disk_info(fd, &disk) < 0) continue; if (disk.major == 0 && disk.minor == 0) continue; found++; - if ((disk.state & (1 << MD_DISK_ACTIVE)) - && disk.raid_disk < data_disks) + if ((disk.state & (1 << MD_DISK_ACTIVE)) && + disk.raid_disk < data_disks) /* keep this */ continue; ioctl(fd, HOT_REMOVE_DISK, makedev(disk.major, disk.minor)); } /* Now fail anything left */ - ioctl(fd, GET_ARRAY_INFO, &array); + md_get_array_info(fd, &array); for (d = 0, found = 0; - d < MAX_DISKS && found < array.nr_disks; - d++) { - int cnt; + d < MAX_DISKS && found < array.nr_disks; d++) { mdu_disk_info_t disk; disk.number = d; - if (ioctl(fd, GET_DISK_INFO, &disk) < 0) + if (md_get_disk_info(fd, &disk) < 0) continue; if (disk.major == 0 && disk.minor == 0) continue; found++; - if ((disk.state & (1 << MD_DISK_ACTIVE)) - && disk.raid_disk < data_disks) + if ((disk.state & (1 << MD_DISK_ACTIVE)) && + disk.raid_disk < data_disks) /* keep this */ continue; ioctl(fd, SET_DISK_FAULTY, makedev(disk.major, disk.minor)); - cnt = 5; - while (ioctl(fd, HOT_REMOVE_DISK, - makedev(disk.major, disk.minor)) < 0 - && errno == EBUSY - && cnt--) { - usleep(10000); - } + hot_remove_disk(fd, makedev(disk.major, disk.minor), 1); } } c = map_num(pers, level); @@ -2743,8 +2971,7 @@ static int impose_level(int fd, int level, char *devname, int verbose) return err; } if (verbose >= 0) - pr_err("level of %s changed to %s\n", - devname, c); + pr_err("level of %s changed to %s\n", devname, c); } return 0; } @@ -2779,12 +3006,11 @@ static int continue_via_systemd(char *devnm) */ close(2); open("/dev/null", O_WRONLY); - snprintf(pathbuf, sizeof(pathbuf), "mdadm-grow-continue@%s.service", - devnm); - status = execl("/usr/bin/systemctl", "systemctl", - "start", + snprintf(pathbuf, sizeof(pathbuf), + "mdadm-grow-continue@%s.service", devnm); + status = execl("/usr/bin/systemctl", "systemctl", "restart", pathbuf, NULL); - status = execl("/bin/systemctl", "systemctl", "start", + status = execl("/bin/systemctl", "systemctl", "restart", pathbuf, NULL); exit(1); case -1: /* Just do it ourselves. */ @@ -2831,7 +3057,7 @@ static int reshape_array(char *container, int fd, char *devname, /* when reshaping a RAID0, the component_size might be zero. * So try to fix that up. */ - if (ioctl(fd, GET_ARRAY_INFO, &array) != 0) { + if (md_get_array_info(fd, &array) != 0) { dprintf("Cannot get array information.\n"); goto release; } @@ -2864,17 +3090,17 @@ static int reshape_array(char *container, int fd, char *devname, pr_err("%s\n", msg); goto release; } - if (restart && - (reshape.level != info->array.level || - reshape.before.layout != info->array.layout || - reshape.before.data_disks + reshape.parity - != info->array.raid_disks - max(0, info->delta_disks))) { + if (restart && (reshape.level != info->array.level || + reshape.before.layout != info->array.layout || + reshape.before.data_disks + reshape.parity != + info->array.raid_disks - max(0, info->delta_disks))) { pr_err("reshape info is not in native format - cannot continue.\n"); goto release; } if (st->ss->external && restart && (info->reshape_progress == 0) && - !((sysfs_get_str(info, NULL, "sync_action", buf, sizeof(buf)) > 0) && + !((sysfs_get_str(info, NULL, "sync_action", + buf, sizeof(buf)) > 0) && (strncmp(buf, "reshape", 7) == 0))) { /* When reshape is restarted from '0', very begin of array * it is possible that for external metadata reshape and array @@ -2888,7 +3114,10 @@ static int reshape_array(char *container, int fd, char *devname, restart = 0; } if (restart) { - /* reshape already started. just skip to monitoring the reshape */ + /* + * reshape already started. just skip to monitoring + * the reshape + */ if (reshape.backup_blocks == 0) return 0; if (restart & RESHAPE_NO_BACKUP) @@ -2896,8 +3125,8 @@ static int reshape_array(char *container, int fd, char *devname, /* Need 'sra' down at 'started:' */ sra = sysfs_read(fd, NULL, - GET_COMPONENT|GET_DEVS|GET_OFFSET|GET_STATE|GET_CHUNK| - GET_CACHE); + GET_COMPONENT|GET_DEVS|GET_OFFSET|GET_STATE| + GET_CHUNK|GET_CACHE); if (!sra) { pr_err("%s: Cannot get array details from sysfs\n", devname); @@ -2920,11 +3149,10 @@ static int reshape_array(char *container, int fd, char *devname, for (dv = devlist; dv ; dv=dv->next) added_disks++; spares_needed = max(reshape.before.data_disks, - reshape.after.data_disks) - + reshape.parity - array.raid_disks; + reshape.after.data_disks) + + reshape.parity - array.raid_disks; - if (!force && - info->new_level > 1 && info->array.level > 1 && + if (!force && info->new_level > 1 && info->array.level > 1 && spares_needed > info->array.spare_disks + added_disks) { pr_err("Need %d spare%s to avoid degraded array, and only have %d.\n" " Use --force to over-ride this check.\n", @@ -2940,8 +3168,7 @@ static int reshape_array(char *container, int fd, char *devname, if ((info->new_level > 1 || info->new_level == 0) && spares_needed > info->array.spare_disks +added_disks) { pr_err("Need %d spare%s to create working array, and only have %d.\n", - spares_needed, - spares_needed == 1 ? "" : "s", + spares_needed, spares_needed == 1 ? "" : "s", info->array.spare_disks + added_disks); goto release; } @@ -2963,8 +3190,7 @@ static int reshape_array(char *container, int fd, char *devname, if (!mdmon_running(container)) start_mdmon(container); ping_monitor(container); - if (mdmon_running(container) && - st->update_tail == NULL) + if (mdmon_running(container) && st->update_tail == NULL) st->update_tail = &st->updates; } } @@ -2980,13 +3206,19 @@ static int reshape_array(char *container, int fd, char *devname, struct mdinfo *d; if (info2) { - sysfs_init(info2, fd, st->devnm); + if (sysfs_init(info2, fd, st->devnm)) { + pr_err("unable to initialize sysfs for %s\n", + st->devnm); + free(info2); + goto release; + } /* When increasing number of devices, we need to set * new raid_disks before adding these, or they might * be rejected. */ if (reshape.backup_blocks && - reshape.after.data_disks > reshape.before.data_disks) + reshape.after.data_disks > + reshape.before.data_disks) subarray_set_num(container, info2, "raid_disks", reshape.after.data_disks + reshape.parity); @@ -3006,9 +3238,10 @@ static int reshape_array(char *container, int fd, char *devname, * array. Now that the array has been changed to the right * level and frozen, we can safely add them. */ - if (devlist) - Manage_subdevs(devname, fd, devlist, verbose, - 0,NULL, 0); + if (devlist) { + if (Manage_subdevs(devname, fd, devlist, verbose, 0, NULL, 0)) + goto release; + } if (reshape.backup_blocks == 0 && data_offset != INVALID_SECTORS) reshape.backup_blocks = reshape.before.data_disks * info->array.chunk_size/512; @@ -3017,7 +3250,7 @@ static int reshape_array(char *container, int fd, char *devname, * some more changes: layout, raid_disks, chunk_size */ /* read current array info */ - if (ioctl(fd, GET_ARRAY_INFO, &array) != 0) { + if (md_get_array_info(fd, &array) != 0) { dprintf("Cannot get array information.\n"); goto release; } @@ -3026,18 +3259,18 @@ static int reshape_array(char *container, int fd, char *devname, if (info->new_layout != UnSet && info->new_layout != array.layout) { array.layout = info->new_layout; - if (ioctl(fd, SET_ARRAY_INFO, &array) != 0) { + if (md_set_array_info(fd, &array) != 0) { pr_err("failed to set new layout\n"); goto release; } else if (verbose >= 0) printf("layout for %s set to %d\n", devname, array.layout); } - if (info->delta_disks != UnSet && - info->delta_disks != 0 && - array.raid_disks != (info->array.raid_disks + info->delta_disks)) { + if (info->delta_disks != UnSet && info->delta_disks != 0 && + array.raid_disks != + (info->array.raid_disks + info->delta_disks)) { array.raid_disks += info->delta_disks; - if (ioctl(fd, SET_ARRAY_INFO, &array) != 0) { + if (md_set_array_info(fd, &array) != 0) { pr_err("failed to set raid disks\n"); goto release; } else if (verbose >= 0) { @@ -3053,7 +3286,7 @@ static int reshape_array(char *container, int fd, char *devname, goto release; } else if (verbose >= 0) printf("chunk size for %s set to %d\n", - devname, array.chunk_size); + devname, info->new_chunk); } unfreeze(st); return 0; @@ -3112,8 +3345,7 @@ static int reshape_array(char *container, int fd, char *devname, /* Nothing to do. */ return 0; return raid10_reshape(container, fd, devname, st, info, - &reshape, data_offset, - force, verbose); + &reshape, data_offset, force, verbose); } sra = sysfs_read(fd, NULL, GET_COMPONENT|GET_DEVS|GET_OFFSET|GET_STATE|GET_CHUNK| @@ -3197,15 +3429,13 @@ started: * not so big that we reject it below. * Try for 16 megabytes */ - while (blocks * 32 < sra->component_size && - blocks < 16*1024*2) + while (blocks * 32 < sra->component_size && blocks < 16*1024*2) blocks *= 2; } else pr_err("Need to backup %luK of critical section..\n", blocks/2); if (blocks >= sra->component_size/2) { - pr_err("%s: Something wrong - reshape aborted\n", - devname); + pr_err("%s: Something wrong - reshape aborted\n", devname); goto release; } @@ -3218,9 +3448,8 @@ started: offsets = xcalloc((1+nrdisks), sizeof(offsets[0])); odisks = reshape.before.data_disks + reshape.parity; - d = reshape_prepare_fdlist(devname, sra, odisks, - nrdisks, blocks, backup_file, - fdlist, offsets); + d = reshape_prepare_fdlist(devname, sra, odisks, nrdisks, blocks, + backup_file, fdlist, offsets); if (d < odisks) { goto release; } @@ -3241,8 +3470,7 @@ started: if (!reshape_open_backup_file(backup_file, fd, devname, (signed)blocks, fdlist+d, offsets+d, - sra->sys_name, - restart)) { + sra->sys_name, restart)) { goto release; } d++; @@ -3250,8 +3478,8 @@ started: } update_cache_size(container, sra, info, - min(reshape.before.data_disks, reshape.after.data_disks), - blocks); + min(reshape.before.data_disks, + reshape.after.data_disks), blocks); /* Right, everything seems fine. Let's kick things off. * If only changing raid_disks, use ioctl, else use @@ -3267,8 +3495,7 @@ started: reshape.after.data_disks); if (err) { pr_err("Cannot %s reshape for %s\n", - restart ? "continue" : "start", - devname); + restart ? "continue" : "start", devname); goto release; } if (restart) @@ -3323,8 +3550,7 @@ started: mds = mdstat_read(1, 0); for (m = mds; m; m = m->next) if (strcmp(m->devnm, sra->sys_name) == 0) { - if (m->resync && - m->percent == RESYNC_DELAYED) + if (m->resync && m->percent == RESYNC_DELAYED) delayed = 1; if (m->resync == 0) /* Haven't started the reshape thread @@ -3356,15 +3582,12 @@ started: /* metadata handler takes it from here */ done = st->ss->manage_reshape( fd, sra, &reshape, st, blocks, - fdlist, offsets, - d - odisks, fdlist+odisks, - offsets+odisks); + fdlist, offsets, d - odisks, fdlist + odisks, + offsets + odisks); } else done = child_monitor( - fd, sra, &reshape, st, blocks, - fdlist, offsets, - d - odisks, fdlist+odisks, - offsets+odisks); + fd, sra, &reshape, st, blocks, fdlist, offsets, + d - odisks, fdlist + odisks, offsets + odisks); free(fdlist); free(offsets); @@ -3390,9 +3613,8 @@ started: } if (!st->ss->external && - !(reshape.before.data_disks != reshape.after.data_disks - && info->custom_array_size) && - info->new_level == reshape.level && + !(reshape.before.data_disks != reshape.after.data_disks && + info->custom_array_size) && info->new_level == reshape.level && !forked) { /* no need to wait for the reshape to finish as * there is nothing more to do. @@ -3416,8 +3638,7 @@ started: /* set new array size if required customer_array_size is used * by this metadata. */ - if (reshape.before.data_disks != - reshape.after.data_disks && + if (reshape.before.data_disks != reshape.after.data_disks && info->custom_array_size) set_array_size(st, info, info->text_version); @@ -3522,7 +3743,7 @@ int reshape_container(char *container, char *devname, int fd; struct mdstat_ent *mdstat; char *adev; - int devid; + dev_t devid; sysfs_free(cc); @@ -3556,7 +3777,8 @@ int reshape_container(char *container, char *devname, fd = open_dev(mdstat->devnm); if (fd < 0) { - pr_err("Device %s cannot be opened for reshape.\n", adev); + pr_err("Device %s cannot be opened for reshape.\n", + adev); break; } @@ -3577,7 +3799,12 @@ int reshape_container(char *container, char *devname, } strcpy(last_devnm, mdstat->devnm); - sysfs_init(content, fd, mdstat->devnm); + if (sysfs_init(content, fd, mdstat->devnm)) { + pr_err("Unable to initialize sysfs for %s\n", + mdstat->devnm); + rv = 1; + break; + } if (mdmon_running(container)) flush_mdmon(container); @@ -3738,8 +3965,7 @@ int progress_reshape(struct mdinfo *info, struct reshape *reshape, max_progress = backup_point; else max_progress = - read_offset * - reshape->after.data_disks; + read_offset * reshape->after.data_disks; } else { if (read_offset > write_offset - write_range) /* Can only progress as far as has been backed up, @@ -3754,8 +3980,7 @@ int progress_reshape(struct mdinfo *info, struct reshape *reshape, else { /* Can progress until metadata update is required */ max_progress = - read_offset * - reshape->after.data_disks; + read_offset * reshape->after.data_disks; /* but data must be suspended */ if (max_progress < *suspend_point) max_progress = *suspend_point; @@ -3784,8 +4009,8 @@ int progress_reshape(struct mdinfo *info, struct reshape *reshape, * a backup. */ if (advancing) { - if ((need_backup > info->reshape_progress - || info->array.major_version < 0) && + if ((need_backup > info->reshape_progress || + info->array.major_version < 0) && *suspend_point < info->reshape_progress + target) { if (need_backup < *suspend_point + 2 * target) *suspend_point = need_backup; @@ -3804,7 +4029,8 @@ int progress_reshape(struct mdinfo *info, struct reshape *reshape, *suspend_point > 0) { *suspend_point = 0; sysfs_set_num(info, NULL, "suspend_lo", 0); - sysfs_set_num(info, NULL, "suspend_hi", need_backup); + sysfs_set_num(info, NULL, "suspend_hi", + need_backup); } } else { /* Need to suspend continually */ @@ -3835,7 +4061,10 @@ int progress_reshape(struct mdinfo *info, struct reshape *reshape, */ /* scale down max_progress to per_disk */ max_progress /= reshape->after.data_disks; - /* Round to chunk size as some kernels give an erroneously high number */ + /* + * Round to chunk size as some kernels give an erroneously + * high number + */ max_progress /= info->new_chunk/512; max_progress *= info->new_chunk/512; /* And round to old chunk size as the kernel wants that */ @@ -3872,22 +4101,21 @@ int progress_reshape(struct mdinfo *info, struct reshape *reshape, * waiting forever on a dead array */ char action[20]; - if (sysfs_get_str(info, NULL, "sync_action", - action, 20) <= 0 || + if (sysfs_get_str(info, NULL, "sync_action", action, 20) <= 0 || strncmp(action, "reshape", 7) != 0) break; /* Some kernels reset 'sync_completed' to zero * before setting 'sync_action' to 'idle'. * So we need these extra tests. */ - if (completed == 0 && advancing - && strncmp(action, "idle", 4) == 0 - && info->reshape_progress > 0) + if (completed == 0 && advancing && + strncmp(action, "idle", 4) == 0 && + info->reshape_progress > 0) break; - if (completed == 0 && !advancing - && strncmp(action, "idle", 4) == 0 - && info->reshape_progress < (info->component_size - * reshape->after.data_disks)) + if (completed == 0 && !advancing && + strncmp(action, "idle", 4) == 0 && + info->reshape_progress < + (info->component_size * reshape->after.data_disks)) break; sysfs_wait(fd, NULL); if (sysfs_fd_get_ll(fd, &completed) < 0) @@ -3900,8 +4128,7 @@ int progress_reshape(struct mdinfo *info, struct reshape *reshape, if (completed == 0) { unsigned long long reshapep; char action[20]; - if (sysfs_get_str(info, NULL, "sync_action", - action, 20) > 0 && + if (sysfs_get_str(info, NULL, "sync_action", action, 20) > 0 && strncmp(action, "idle", 4) == 0 && sysfs_get_ll(info, NULL, "reshape_position", &reshapep) == 0) @@ -3938,8 +4165,8 @@ check_progress: * it was just a device failure that leaves us degraded but * functioning. */ - if (sysfs_get_str(info, NULL, "reshape_position", buf, sizeof(buf)) < 0 - || strncmp(buf, "none", 4) != 0) { + if (sysfs_get_str(info, NULL, "reshape_position", buf, + sizeof(buf)) < 0 || strncmp(buf, "none", 4) != 0) { /* The abort might only be temporary. Wait up to 10 * seconds for fd to contain a valid number again. */ @@ -3956,7 +4183,8 @@ check_progress: /* If "sync_max" is no longer max_progress * we need to freeze things */ - sysfs_get_ll(info, NULL, "sync_max", &new_sync_max); + sysfs_get_ll(info, NULL, "sync_max", + &new_sync_max); *frozen = (new_sync_max != max_progress); break; case -2: /* read error - abort */ @@ -3971,9 +4199,10 @@ check_progress: /* Maybe racing with array shutdown - check state */ if (fd >= 0) close(fd); - if (sysfs_get_str(info, NULL, "array_state", buf, sizeof(buf)) < 0 - || strncmp(buf, "inactive", 8) == 0 - || strncmp(buf, "clear",5) == 0) + if (sysfs_get_str(info, NULL, "array_state", buf, + sizeof(buf)) < 0 || + strncmp(buf, "inactive", 8) == 0 || + strncmp(buf, "clear",5) == 0) return -2; /* abort */ return -1; /* complete */ } @@ -4017,8 +4246,10 @@ static int grow_backup(struct mdinfo *sra, if (sd->disk.state & (1<disk.state & (1<after.data_disks >= reshape->before.data_disks; - int part = 0; /* The next part of the backup area to fill. It may already - * be full, so we need to check */ + int increasing = reshape->after.data_disks >= + reshape->before.data_disks; + int part = 0; /* The next part of the backup area to fill. It + * may already be full, so we need to check */ int level = reshape->level; int layout = reshape->before.layout; int data = reshape->before.data_disks; @@ -4407,11 +4640,9 @@ int child_monitor(int afd, struct mdinfo *sra, struct reshape *reshape, } if (actual_stripes == 0) break; - grow_backup(sra, offset, actual_stripes, - fds, offsets, - disks, chunk, level, layout, - dests, destfd, destoffsets, - part, °raded, buf); + grow_backup(sra, offset, actual_stripes, fds, offsets, + disks, chunk, level, layout, dests, destfd, + destoffsets, part, °raded, buf); validate(afd, destfd[0], destoffsets[0]); /* record where 'part' is up to */ part = !part; @@ -4440,8 +4671,8 @@ int child_monitor(int afd, struct mdinfo *sra, struct reshape *reshape, * write that data into the array and update the super blocks with * the new reshape_progress */ -int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt, - char *backup_file, int verbose) +int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, + int cnt, char *backup_file, int verbose) { int i, j; int old_disks; @@ -4450,9 +4681,11 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt int ndata, odata; odata = info->array.raid_disks - info->delta_disks - 1; - if (info->array.level == 6) odata--; /* number of data disks */ + if (info->array.level == 6) + odata--; /* number of data disks */ ndata = info->array.raid_disks - 1; - if (info->new_level == 6) ndata--; + if (info->new_level == 6) + ndata--; old_disks = info->array.raid_disks - info->delta_disks; @@ -4515,24 +4748,30 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt } if (bsb.sb_csum != bsb_csum((char*)&bsb, ((char*)&bsb.sb_csum)-((char*)&bsb))) { if (verbose) - pr_err("Bad backup-metadata checksum on %s\n", devname); + pr_err("Bad backup-metadata checksum on %s\n", + devname); continue; /* bad checksum */ } if (memcmp(bsb.magic, "md_backup_data-2", 16) == 0 && bsb.sb_csum2 != bsb_csum((char*)&bsb, ((char*)&bsb.sb_csum2)-((char*)&bsb))) { if (verbose) - pr_err("Bad backup-metadata checksum2 on %s\n", devname); + pr_err("Bad backup-metadata checksum2 on %s\n", + devname); continue; /* Bad second checksum */ } if (memcmp(bsb.set_uuid,info->uuid, 16) != 0) { if (verbose) - pr_err("Wrong uuid on backup-metadata on %s\n", devname); + pr_err("Wrong uuid on backup-metadata on %s\n", + devname); continue; /* Wrong uuid */ } - /* array utime and backup-mtime should be updated at much the same time, but it seems that - * sometimes they aren't... So allow considerable flexability in matching, and allow - * this test to be overridden by an environment variable. + /* + * array utime and backup-mtime should be updated at + * much the same time, but it seems that sometimes + * they aren't... So allow considerable flexability in + * matching, and allow this test to be overridden by + * an environment variable. */ if(time_after(info->array.utime, (unsigned int)__le64_to_cpu(bsb.mtime) + 2*60*60) || time_before(info->array.utime, (unsigned int)__le64_to_cpu(bsb.mtime) - 10*60)) { @@ -4573,8 +4812,7 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt /* reshape_progress is increasing */ if ((__le64_to_cpu(bsb.arraystart) + __le64_to_cpu(bsb.length) - < info->reshape_progress) - && + < info->reshape_progress) && (__le64_to_cpu(bsb.arraystart2) + __le64_to_cpu(bsb.length2) < info->reshape_progress)) @@ -4620,12 +4858,10 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt } printf("%s: restoring critical section\n", Name); - if (restore_stripes(fdlist, offsets, - info->array.raid_disks, - info->new_chunk, - info->new_level, - info->new_layout, - fd, __le64_to_cpu(bsb.devstart)*512, + if (restore_stripes(fdlist, offsets, info->array.raid_disks, + info->new_chunk, info->new_level, + info->new_layout, fd, + __le64_to_cpu(bsb.devstart)*512, __le64_to_cpu(bsb.arraystart)*512, __le64_to_cpu(bsb.length)*512, NULL)) { /* didn't succeed, so giveup */ @@ -4637,12 +4873,10 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt } if (bsb.magic[15] == '2' && - restore_stripes(fdlist, offsets, - info->array.raid_disks, - info->new_chunk, - info->new_level, - info->new_layout, - fd, __le64_to_cpu(bsb.devstart)*512 + + restore_stripes(fdlist, offsets, info->array.raid_disks, + info->new_chunk, info->new_level, + info->new_layout, fd, + __le64_to_cpu(bsb.devstart)*512 + __le64_to_cpu(bsb.devstart2)*512, __le64_to_cpu(bsb.arraystart2)*512, __le64_to_cpu(bsb.length2)*512, NULL)) { @@ -4675,15 +4909,16 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt else lo = lo1; } - if (lo < hi && - (info->reshape_progress < lo || - info->reshape_progress > hi)) + if (lo < hi && (info->reshape_progress < lo || + info->reshape_progress > hi)) /* backup does not affect reshape_progress*/ ; else if (info->delta_disks >= 0) { info->reshape_progress = __le64_to_cpu(bsb.arraystart) + __le64_to_cpu(bsb.length); if (bsb.magic[15] == '2') { - unsigned long long p2 = __le64_to_cpu(bsb.arraystart2) + + unsigned long long p2; + + p2 = __le64_to_cpu(bsb.arraystart2) + __le64_to_cpu(bsb.length2); if (p2 > info->reshape_progress) info->reshape_progress = p2; @@ -4691,7 +4926,9 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt } else { info->reshape_progress = __le64_to_cpu(bsb.arraystart); if (bsb.magic[15] == '2') { - unsigned long long p2 = __le64_to_cpu(bsb.arraystart2); + unsigned long long p2; + + p2 = __le64_to_cpu(bsb.arraystart2); if (p2 < info->reshape_progress) info->reshape_progress = p2; } @@ -4703,8 +4940,7 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt continue; st->ss->getinfo_super(st, &dinfo, NULL); dinfo.reshape_progress = info->reshape_progress; - st->ss->update_super(st, &dinfo, - "_reshape_progress", + st->ss->update_super(st, &dinfo, "_reshape_progress", NULL,0, 0, NULL); st->ss->store_super(st, fdlist[j]); st->ss->free_super(st); @@ -4765,59 +5001,66 @@ int Grow_continue_command(char *devname, int fd, int cfd = -1; int fd2; - dprintf("Grow continue from command line called for %s\n", - devname); + dprintf("Grow continue from command line called for %s\n", devname); st = super_by_fd(fd, &subarray); if (!st || !st->ss) { - pr_err("Unable to determine metadata format for %s\n", - devname); + pr_err("Unable to determine metadata format for %s\n", devname); return 1; } dprintf("Grow continue is run for "); if (st->ss->external == 0) { int d; + int cnt = 5; dprintf_cont("native array (%s)\n", devname); - if (ioctl(fd, GET_ARRAY_INFO, &array.array) < 0) { - pr_err("%s is not an active md array - aborting\n", devname); + if (md_get_array_info(fd, &array.array) < 0) { + pr_err("%s is not an active md array - aborting\n", + devname); ret_val = 1; goto Grow_continue_command_exit; } content = &array; + sysfs_init(content, fd, NULL); /* Need to load a superblock. * FIXME we should really get what we need from * sysfs */ - for (d = 0; d < MAX_DISKS; d++) { - mdu_disk_info_t disk; - char *dv; - int err; - disk.number = d; - if (ioctl(fd, GET_DISK_INFO, &disk) < 0) - continue; - if (disk.major == 0 && disk.minor == 0) - continue; - if ((disk.state & (1 << MD_DISK_ACTIVE)) == 0) - continue; - dv = map_dev(disk.major, disk.minor, 1); - if (!dv) - continue; - fd2 = dev_open(dv, O_RDONLY); - if (fd2 < 0) - continue; - err = st->ss->load_super(st, fd2, NULL); - close(fd2); - if (err) - continue; - break; - } - if (d == MAX_DISKS) { - pr_err("Unable to load metadata for %s\n", - devname); - ret_val = 1; - goto Grow_continue_command_exit; - } - st->ss->getinfo_super(st, content, NULL); + do { + for (d = 0; d < MAX_DISKS; d++) { + mdu_disk_info_t disk; + char *dv; + int err; + disk.number = d; + if (md_get_disk_info(fd, &disk) < 0) + continue; + if (disk.major == 0 && disk.minor == 0) + continue; + if ((disk.state & (1 << MD_DISK_ACTIVE)) == 0) + continue; + dv = map_dev(disk.major, disk.minor, 1); + if (!dv) + continue; + fd2 = dev_open(dv, O_RDONLY); + if (fd2 < 0) + continue; + err = st->ss->load_super(st, fd2, NULL); + close(fd2); + if (err) + continue; + break; + } + if (d == MAX_DISKS) { + pr_err("Unable to load metadata for %s\n", + devname); + ret_val = 1; + goto Grow_continue_command_exit; + } + st->ss->getinfo_super(st, content, NULL); + if (!content->reshape_active) + sleep(3); + else + break; + } while (cnt-- > 0); } else { char *container; @@ -4842,15 +5085,14 @@ int Grow_continue_command(char *devname, int fd, */ ret_val = st->ss->load_container(st, cfd, NULL); if (ret_val) { - pr_err("Cannot read superblock for %s\n", - devname); + pr_err("Cannot read superblock for %s\n", devname); ret_val = 1; goto Grow_continue_command_exit; } cc = st->ss->container_content(st, subarray); for (content = cc; content ; content = content->next) { - char *array; + char *array_name; int allow_reshape = 1; if (content->reshape_active == 0) @@ -4875,8 +5117,8 @@ int Grow_continue_command(char *devname, int fd, goto Grow_continue_command_exit; } - array = strchr(content->text_version+1, '/')+1; - mdstat = mdstat_by_subdev(array, container); + array_name = strchr(content->text_version+1, '/')+1; + mdstat = mdstat_by_subdev(array_name, container); if (!mdstat) continue; if (mdstat->active == 0) { @@ -4900,7 +5142,13 @@ int Grow_continue_command(char *devname, int fd, goto Grow_continue_command_exit; } - sysfs_init(content, fd2, mdstat->devnm); + if (sysfs_init(content, fd2, mdstat->devnm)) { + pr_err("Unable to initialize sysfs for %s, Grow cannot continue.\n", + mdstat->devnm); + ret_val = 1; + close(fd2); + goto Grow_continue_command_exit; + } close(fd2); @@ -4959,15 +5207,13 @@ int Grow_continue(int mdfd, struct supertype *st, struct mdinfo *info, st->ss->load_container(st, cfd, st->container_devnm); close(cfd); ret_val = reshape_container(st->container_devnm, NULL, mdfd, - st, info, 0, backup_file, - 0, forked, - 1 | info->reshape_active, + st, info, 0, backup_file, 0, + forked, 1 | info->reshape_active, freeze_reshape); } else ret_val = reshape_array(NULL, mdfd, "array", st, info, 1, - NULL, INVALID_SECTORS, - backup_file, 0, forked, - 1 | info->reshape_active, + NULL, INVALID_SECTORS, backup_file, + 0, forked, 1 | info->reshape_active, freeze_reshape); return ret_val; @@ -4990,8 +5236,7 @@ char *locate_backup(char *name) char *fl = make_backup(name); struct stat stb; - if (stat(fl, &stb) == 0 && - S_ISREG(stb.st_mode)) + if (stat(fl, &stb) == 0 && S_ISREG(stb.st_mode)) return fl; free(fl);