[PATCH] super1: make the check for NodeNumUpdate more accurate

[PATCH] super1: make the check for NodeNumUpdate more accurate

[Guoqing Jiang]

We missed to check the version is BITMAP_MAJOR_CLUSTERED
or not, otherwise mdadm can't create array with other 1.x
metadatas (1.0 and 1.1).

Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
---
 super1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/super1.c b/super1.c
index 972b470..fa93367 100644
--- a/super1.c
+++ b/super1.c
@@ -2389,7 +2389,7 @@ static int write_bitmap1(struct supertype *st, int fd, enum bitmap_update update
 		break;
 	case NodeNumUpdate:
 		/* cluster md only supports superblock 1.2 now */
-		if (st->minor_version != 2) {
+		if (st->minor_version != 2 && bms->version == BITMAP_MAJOR_CLUSTERED) {
 			pr_err("Warning: cluster md only works with superblock 1.2\n");
 			return -EINVAL;
 		}
-- 
2.6.2

Re: [PATCH] super1: make the check for NodeNumUpdate more accurate

[Jes Sorensen]

Guoqing Jiang <gqjiang@suse.com> writes:
> We missed to check the version is BITMAP_MAJOR_CLUSTERED
> or not, otherwise mdadm can't create array with other 1.x
> metadatas (1.0 and 1.1).
>
> Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
> ---
>  super1.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied!

Also applied the two patches from last week.

Thanks,
Jes