File 0006-Convert-a-bitmap-none-device-to-clustered.... of Package mdadm.1739

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-Convert-a-bitmap-none-device-to-clustered.patch of Package mdadm.1739

From 7f3d0f2b91804242272b67c94e83642c782625e3 Mon Sep 17 00:00:00 2001
From: Guoqing Jiang <gqjiang@suse.com>
Date: Tue, 7 Jul 2015 14:54:08 +0800
Subject: [PATCH 06/11] Convert a bitmap=none device to clustered

This adds the ability to convert a regular md without bitmap
(--bitmap=none) to a clustered device (--bitmap=clustered).

To convert a device with --bitmap=internal or --bitmap=external,
you have to convert to --bitmap=none and then re-execute the
command with --bitmap=clustered.

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---
 Grow.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Grow.c b/Grow.c
index ea9cc60..b25473f 100644
--- a/Grow.c
+++ b/Grow.c
@@ -334,8 +334,7 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s)
 			}
 			return 0;
 		}
-		pr_err("Internal bitmap already present on %s\n",
-			devname);
+		pr_err("%s bitmap already present on %s\n", s->bitmap_file, devname);
 		return 1;
 	}
 
@@ -379,7 +378,8 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s)
 		free(st);
 		return 1;
 	}
-	if (strcmp(s->bitmap_file, "internal") == 0) {
+	if (strcmp(s->bitmap_file, "internal") == 0 ||
+	    strcmp(s->bitmap_file, "clustered") == 0) {
 		int rv;
 		int d;
 		int offset_setable = 0;
@@ -389,6 +389,8 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s)
 				"with %s metadata\n", st->ss->name);
 			return 1;
 		}
+		st->nodes = c->nodes;
+		st->cluster_name = c->homecluster;
 		mdi = sysfs_read(fd, NULL, GET_BITMAP_LOCATION);
 		if (mdi)
 			offset_setable = 1;
@@ -432,6 +434,8 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s)
 			rv = sysfs_set_num_signed(mdi, NULL, "bitmap/location",
 						  mdi->bitmap_offset);
 		} else {
+			if (strcmp(s->bitmap_file, "clustered") == 0)
+				array.state |= (1<<MD_SB_CLUSTERED);
 			array.state |= (1<<MD_SB_BITMAP_PRESENT);
 			rv = ioctl(fd, SET_ARRAY_INFO, &array);
 		}
-- 
1.7.12.4

Places

File 0006-Convert-a-bitmap-none-device-to-clustered.patch of Package mdadm.1739

Places