mdadm:check the nodes when operate clustered array

It doesn't make sense to write_bitmap with less than 2 nodes,
in order to avoid 'write_bitmap' received invalid nodes number,
it would be better to do checking nodes in getopt operations.

Signed-off-by: Zhilong Liu <zlliu@suse.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>

diff --git a/mdadm.c b/mdadm.c
index 16fd49a714608becadd248b7f20c173183c35c1b..b5ac06113747657723bf71afc081762963e872bb 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -603,8 +603,8 @@ int main(int argc, char *argv[])
                case O(GROW, Nodes):
                case O(CREATE, Nodes):
                        c.nodes = parse_num(optarg);
-                       if (c.nodes <= 0) {
-                               pr_err("invalid number for the number of cluster nodes: %s\n",
+                       if (c.nodes < 2) {
+                               pr_err("clustered array needs two nodes at least: %s\n",
                                        optarg);
                                exit(2);
                        }

diff --git a/super1.c b/super1.c
index 87a74cb945083b7ca82e5d24293015267ac95de4..882cd61a0f3285ad244363bfa9fb92c5811045d3 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -2380,14 +2380,7 @@ static int write_bitmap1(struct supertype *st, int fd, enum bitmap_update update
                }
 
                if (bms->version == BITMAP_MAJOR_CLUSTERED) {
-                       if (st->nodes == 1) {
-                               /* the parameter for nodes is not valid */
-                               pr_err("Warning: cluster-md at least needs two nodes\n");
-                               return -EINVAL;
-                       } else if (st->nodes == 0)
-                               /* --nodes is not specified */
-                               break;
-                       else if (__cpu_to_le32(st->nodes) < bms->nodes) {
+                       if (__cpu_to_le32(st->nodes) < bms->nodes) {
                                /* Since the nodes num is not increased, no need to check the space
                                 * is enough or not, just update bms->nodes */
                                bms->nodes = __cpu_to_le32(st->nodes);