summaryrefslogtreecommitdiff
path: root/Grow.c
diff options
context:
space:
mode:
authorAdam Kwolek <adam.kwolek@intel.com>2011-02-09 14:07:26 +1100
committerNeilBrown <neilb@suse.de>2011-02-09 14:07:26 +1100
commit9e3254422dbce93aad7c24bfc81e15e9fcab8237 (patch)
tree48fc49d2e5e75326ffbb970ca9f5fe54f948a407 /Grow.c
parent8200f09e8fad8f67cc0f1231b4967ea373b0d56c (diff)
FIX: Container can be left frozen
When container operation fails before child process starts, array can be left frozen because container_reshape() doesn't make unfreeze() operation in all error cases, as it is responsible for. add unfreeze() operation for error case scenarios in reshape_container() Signed-off-by: Adam Kwolek <adam.kwolek@intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'Grow.c')
-rw-r--r--Grow.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Grow.c b/Grow.c
index 8229b4d4..f245e03a 100644
--- a/Grow.c
+++ b/Grow.c
@@ -2122,8 +2122,10 @@ int reshape_container(char *container, int cfd, char *devname,
if (reshape_super(st, -1, info->new_level,
info->new_layout, info->new_chunk,
info->array.raid_disks + info->delta_disks,
- backup_file, devname, quiet))
+ backup_file, devname, quiet)) {
+ unfreeze(st);
return 1;
+ }
sync_metadata(st);
@@ -2134,6 +2136,7 @@ int reshape_container(char *container, int cfd, char *devname,
switch (fork()) {
case -1: /* error */
perror("Cannot fork to complete reshape\n");
+ unfreeze(st);
return 1;
default: /* parent */
printf(Name ": multi-array reshape continues in background\n");