diff options
Diffstat (limited to 'Grow.c')
| -rw-r--r-- | Grow.c | 30 |
1 files changed, 7 insertions, 23 deletions
@@ -1746,7 +1746,7 @@ static int reshape_array(char *container, int fd, char *devname, int force, struct mddev_dev *devlist, unsigned long long data_offset, char *backup_file, int verbose, int forked, - int restart, int freeze_reshape); + int restart); static int reshape_container(char *container, char *devname, int mdfd, struct supertype *st, @@ -2341,7 +2341,7 @@ size_change_error: sync_metadata(st); rv = reshape_array(container, fd, devname, st, &info, c->force, devlist, s->data_offset, c->backup_file, - c->verbose, 0, 0, 0); + c->verbose, 0, 0); frozen = 0; } release: @@ -3000,7 +3000,7 @@ static int reshape_array(char *container, int fd, char *devname, int force, struct mddev_dev *devlist, unsigned long long data_offset, char *backup_file, int verbose, int forked, - int restart, int freeze_reshape) + int restart) { struct reshape reshape; int spares_needed; @@ -3484,14 +3484,6 @@ started: } if (restart) sysfs_set_str(sra, NULL, "array_state", "active"); - if (freeze_reshape) { - free(fdlist); - free(offsets); - sysfs_free(sra); - pr_err("Reshape has to be continued from location %llu when root filesystem has been mounted.\n", - sra->reshape_progress); - return 1; - } if (!forked) if (continue_via_systemd(container ?: sra->sys_name, @@ -3688,7 +3680,7 @@ int reshape_container(char *container, char *devname, */ ping_monitor(container); - if (!forked && !c->freeze_reshape) + if (!forked) if (continue_via_systemd(container, GROW_SERVICE, NULL)) return 0; @@ -3698,8 +3690,7 @@ int reshape_container(char *container, char *devname, unfreeze(st); return 1; default: /* parent */ - if (!c->freeze_reshape) - printf("%s: multi-array reshape continues in background\n", Name); + printf("%s: multi-array reshape continues in background\n", Name); return 0; case 0: /* child */ manage_fork_fds(0); @@ -3797,15 +3788,9 @@ int reshape_container(char *container, char *devname, rv = reshape_array(container, fd, adev, st, content, c->force, NULL, INVALID_SECTORS, - c->backup_file, c->verbose, 1, restart, - c->freeze_reshape); + c->backup_file, c->verbose, 1, restart); close(fd); - if (c->freeze_reshape) { - sysfs_free(cc); - exit(0); - } - restart = 0; if (rv) break; @@ -5220,8 +5205,7 @@ int Grow_continue(int mdfd, struct supertype *st, struct mdinfo *info, } else ret_val = reshape_array(NULL, mdfd, "array", st, info, 1, NULL, INVALID_SECTORS, c->backup_file, - 0, forked, 1 | info->reshape_active, - c->freeze_reshape); + 0, forked, 1 | info->reshape_active); return ret_val; } |