summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-02-01 13:07:36 +1100
committerNeilBrown <neilb@suse.de>2011-02-01 13:07:36 +1100
commite5e5d7cea390fd33d6be09ee6d8a47bc7695eb50 (patch)
tree1497f6c85b342cef648c1977401708f981598fbb /util.c
parentac597b1c2134b4342df3c957fa054c34e522bee9 (diff)
Incr: don't exclude 'active' devices from auto inclusion in a container.
For containers, it is always appropriate to include a device in the container. Whether it should then be included in an array is a separate question. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'util.c')
-rw-r--r--util.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/util.c b/util.c
index 38750b24..a0d8283c 100644
--- a/util.c
+++ b/util.c
@@ -1490,8 +1490,7 @@ int is_subarray_active(char *subarray, char *container)
for (ent = mdstat; ent; ent = ent->next)
if (is_container_member(ent, container))
- if (!subarray ||
- strcmp(to_subarray(ent, container), subarray) == 0)
+ if (strcmp(to_subarray(ent, container), subarray) == 0)
break;
free_mdstat(mdstat);
@@ -1499,11 +1498,6 @@ int is_subarray_active(char *subarray, char *container)
return ent != NULL;
}
-int is_container_active(char *container)
-{
- return is_subarray_active(NULL, container);
-}
-
/* open_subarray - opens a subarray in a container
* @dev: container device name
* @st: empty supertype