From: Czarnowska, Anna <anna.czarnowska@intel.com>
Date: Mon, 31 Jan 2011 23:40:56 +0000 (+1100)
Subject: Monitor: do not move partitions to external container
X-Git-Tag: mdadm-3.2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfd76b93090a80a746869e8c3f826f91550e9b39;p=thirdparty%2Fmdadm.git

Monitor: do not move partitions to external container

Arrays on partitions are not supported for external metadata
so do not take such spare from native array.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Monitor.c b/Monitor.c
index acc82ac4..adc89d08 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -765,6 +765,10 @@ static dev_t choose_spare(struct state *from, struct state *to,
 			struct dev_policy *pol;
 			unsigned long long dev_size;
 
+			if (to->metadata->ss->external &&
+			    test_partition_from_id(from->devid[d]))
+				continue;
+
 			if (min_size &&
 			    dev_size_from_id(from->devid[d], &dev_size) &&
 			    dev_size < min_size)
diff --git a/mdadm.h b/mdadm.h
index 369118c7..8fa3af46 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -1120,6 +1120,7 @@ extern int ask(char *mesg);
 extern unsigned long long get_component_size(int fd);
 extern void remove_partitions(int fd);
 extern int test_partition(int fd);
+extern int test_partition_from_id(dev_t id);
 extern unsigned long long calc_array_size(int level, int raid_disks, int layout,
 				   int chunksize, unsigned long long devsize);
 extern int flush_metadata_updates(struct supertype *st);
diff --git a/util.c b/util.c
index b806a97c..38750b24 100644
--- a/util.c
+++ b/util.c
@@ -295,6 +295,19 @@ int test_partition(int fd)
 	return 1;
 }
 
+int test_partition_from_id(dev_t id)
+{
+	char buf[20];
+	int fd, rv;
+
+	sprintf(buf, "%d:%d", major(id), minor(id));
+	fd = dev_open(buf, O_RDONLY);
+	if (fd < 0)
+		return -1;
+	rv = test_partition(fd);
+	close(fd);
+	return rv;
+}
 
 int enough(int level, int raid_disks, int layout, int clean,
 	   char *avail, int avail_disks)