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)
disk.number = d;
if (md_get_disk_info(fd, &disk) < 0) {
- pr_err("cannot get device detail for device %d\n",
- d);
+ 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;
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;
}
disk.number = d;
if (md_get_disk_info(fd, &disk) < 0) {
- pr_err("cannot get device detail for device %d\n",
- d);
+ 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);
}
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 (md_get_array_info(fd, &array) != 0) {
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);
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) {
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;
int dfd;
char *devpath;
- if ((sd->disk.state & (1 << MD_DISK_SYNC)) == 0)
- continue;
-
devpath = map_dev(sd->disk.major, sd->disk.minor, 0);
dfd = dev_open(devpath, O_RDWR);
if (dfd < 0) {
goto free_info;
}
- ret = st->ss->update_super(st, sra, "ppl", devname,
+ ret = st->ss->update_super(st, sra, "ppl",
+ devname,
c->verbose, 0, NULL);
if (ret) {
close(dfd);
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);
+ 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",
/* 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;
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);
continue;
if (sd->disk.state & (1<<MD_DISK_SYNC) &&
sd->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",
}
} 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) {
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)
* 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";
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;
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) {
devname);
return 1;
}
+ 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;
}
+ if (array.level > 1 && s->size > 1 &&
+ (array.chunk_size / 1024) > (int)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);
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;
}
retval = st->ss->load_container(st, cfd, NULL);
if (retval) {
- pr_err("Cannot read superblock for %s\n",
- devname);
+ pr_err("Cannot read superblock for %s\n", devname);
free(subarray);
return 1;
}
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);
}
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",
*/
min_csize = 0;
for (mdi = sra->devs; mdi; mdi = mdi->next) {
- sysfs_set_num(sra, mdi, "size", s->size == MAX_SIZE ? 0
- : s->size);
+ 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 (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
* 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");
}
md_get_array_info(fd, &array);
(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;
}
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");
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
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:
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;
}
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 &&
* 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;
}
}
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;
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");
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;
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<<MD_SB_BITMAP_PRESENT)))
}
md_get_array_info(fd, &array);
- if (level == 0 &&
- (array.level >= 4 && array.level <= 6)) {
+ 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;
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 (md_get_disk_info(fd, &disk) < 0)
/* Now fail anything left */
md_get_array_info(fd, &array);
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 (md_get_disk_info(fd, &disk) < 0)
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;
}
*/
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. */
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
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)
/* 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);
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",
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;
}
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;
}
}
if (info2) {
if (sysfs_init(info2, fd, st->devnm)) {
- pr_err("unable to initialize sysfs for %s",
+ pr_err("unable to initialize sysfs for %s\n",
st->devnm);
free(info2);
goto release;
* 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);
* level and frozen, we can safely add them.
*/
if (devlist) {
- if (Manage_subdevs(devname, fd, devlist, verbose,
- 0, NULL, 0))
+ if (Manage_subdevs(devname, fd, devlist, verbose, 0, NULL, 0))
goto release;
}
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 (md_set_array_info(fd, &array) != 0) {
pr_err("failed to set raid disks\n");
/* 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|
* 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;
}
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;
}
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++;
}
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
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)
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
/* 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);
/* 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);
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;
}
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,
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;
*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 */
*/
/* 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 */
* 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
break;
if (completed == 0 && !advancing &&
strncmp(action, "idle", 4) == 0 &&
- info->reshape_progress < (info->component_size
- * reshape->after.data_disks))
+ info->reshape_progress <
+ (info->component_size * reshape->after.data_disks))
break;
sysfs_wait(fd, NULL);
if (sysfs_fd_get_ll(fd, &completed) < 0)
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)
* functioning.
*/
if (sysfs_get_str(info, NULL, "reshape_position", buf,
- sizeof(buf)) < 0 ||
- strncmp(buf, "none", 4) != 0) {
+ 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.
*/
/* 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 */
bsb.magic[15] = '2';
for (i = 0; i < dests; i++)
if (part)
- lseek64(destfd[i], destoffsets[i] + __le64_to_cpu(bsb.devstart2)*512, 0);
+ lseek64(destfd[i], destoffsets[i] +
+ __le64_to_cpu(bsb.devstart2)*512, 0);
else
lseek64(destfd[i], destoffsets[i], 0);
- rv = save_stripes(sources, offsets,
- disks, chunk, level, layout,
- dests, destfd,
- offset*512*odata, stripes * chunk * odata,
- buf);
+ rv = save_stripes(sources, offsets, disks, chunk, level, layout,
+ dests, destfd, offset * 512 * odata,
+ stripes * chunk * odata, buf);
if (rv)
return rv;
for (i = 0; i < dests; i++) {
bsb.devstart = __cpu_to_le64(destoffsets[i]/512);
- bsb.sb_csum = bsb_csum((char*)&bsb, ((char*)&bsb.sb_csum)-((char*)&bsb));
+ bsb.sb_csum = bsb_csum((char*)&bsb,
+ ((char*)&bsb.sb_csum)-((char*)&bsb));
if (memcmp(bsb.magic, "md_backup_data-2", 16) == 0)
bsb.sb_csum2 = bsb_csum((char*)&bsb,
((char*)&bsb.sb_csum2)-((char*)&bsb));
rv = 0;
for (i = 0; i < dests; i++) {
bsb.devstart = __cpu_to_le64(destoffsets[i]/512);
- bsb.sb_csum = bsb_csum((char*)&bsb, ((char*)&bsb.sb_csum)-((char*)&bsb));
+ bsb.sb_csum = bsb_csum((char*)&bsb,
+ ((char*)&bsb.sb_csum)-((char*)&bsb));
if (memcmp(bsb.magic, "md_backup_data-2", 16) == 0)
bsb.sb_csum2 = bsb_csum((char*)&bsb,
((char*)&bsb.sb_csum2)-((char*)&bsb));
if ((unsigned long long)lseek64(destfd[i], destoffsets[i]-4096, 0) !=
destoffsets[i]-4096)
rv = -1;
- if (rv == 0 &&
- write(destfd[i], &bsb, 512) != 512)
+ if (rv == 0 && write(destfd[i], &bsb, 512) != 512)
rv = -1;
fsync(destfd[i]);
}
unsigned long long backup_point, wait_point;
unsigned long long reshape_completed;
int done = 0;
- 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 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;
}
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;
* 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;
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;
}
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)) {
}
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 */
}
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)) {
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;
} 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;
}
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);
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 ");
*/
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;
}
}
if (sysfs_init(content, fd2, mdstat->devnm)) {
- pr_err("Unable to initialize sysfs for %s, Grow cannot continue",
+ pr_err("Unable to initialize sysfs for %s, Grow cannot continue.\n",
mdstat->devnm);
ret_val = 1;
close(fd2);
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;
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);
projects / thirdparty / mdadm.git / blobdiff