summaryrefslogtreecommitdiff
path: root/super-intel.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-11-01 15:45:46 +1100
committerNeilBrown <neilb@suse.de>2011-11-01 15:45:46 +1100
commit446894ea8db17a2dfc740f81d58190c5ac8167d5 (patch)
tree3ced8643ef61f251f2ba93ecf234bd50dcc00f9b /super-intel.c
parentad098cdd7943bd16638280f8b7f59e9af250954d (diff)
Grow: fix check_reshape and open_code it.
check_reshape should not try to parse the subarray string - only metadata handlers are allowed to do that. The common code and only interpret a subarray string by passing it to "container_content" which will then return only the member for that subarray. So remove check_reshape and place similar logic explicitly at the two call-sites. They are different enough that it is probably clearer to have explicit code. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'super-intel.c')
-rw-r--r--super-intel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/super-intel.c b/super-intel.c
index 1caee704..34a4b343 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -5759,8 +5759,8 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
map->num_members, /* raid disks */
&chunk,
1 /* verbose */)) {
- fprintf(stderr, Name ": IMSM RAID gemetry validation failed. "
- "Array %s activation is blocked.\n",
+ fprintf(stderr, Name ": IMSM RAID geometry validation"
+ " failed. Array %s activation is blocked.\n",
dev->volume);
this->array.state |=
(1<<MD_SB_BLOCK_CONTAINER_RESHAPE) |