File 0004-mdadm-check-the-nodes-when-operate-cluster... of Package mdadm

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-mdadm-check-the-nodes-when-operate-clustered-array.patch of Package mdadm (Revision 3e9b9ccbbfc1b5b9b0a70418618ee811)

Currently displaying revision 3e9b9ccbbfc1b5b9b0a70418618ee811 , Show latest

From 9d67f6496c71efbc68b33aea663dbcc1597a0828 Mon Sep 17 00:00:00 2001
From: Zhilong Liu <zlliu@suse.com>
Date: Wed, 1 Mar 2017 18:42:33 +0800
Subject: [PATCH] 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>
---
 mdadm.c  | 4 ++--
 super1.c | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/mdadm.c b/mdadm.c
index 16fd49a..b5ac061 100644
--- 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 87a74cb..882cd61 100644
--- 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);
-- 
2.10.2

Places

File 0004-mdadm-check-the-nodes-when-operate-clustered-array.patch of Package mdadm (Revision 3e9b9ccbbfc1b5b9b0a70418618ee811)

Places