From: NeilBrown <neilb@suse.de>
Date: Mon, 9 Sep 2013 23:48:06 +0000 (+1000)
Subject: Move ARRAY_SIZE macro to common include file.
X-Git-Tag: mdadm-3.3.1~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c0aebc2bec4d8e7e575c4222600826de3f1b73e;p=thirdparty%2Fmdadm.git

Move ARRAY_SIZE macro to common include file.

That was super-ddf can use it.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/mdadm.h b/mdadm.h
index 91d27139..2eca6032 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -178,6 +178,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
 	(void) (&_max1 == &_max2);              \
 	_max1 > _max2 ? _max1 : _max2; })
 
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+
 /* general information that might be extracted from a superblock */
 struct mdinfo {
 	mdu_array_info_t	array;
diff --git a/probe_roms.c b/probe_roms.c
index 61297959..b0b08833 100644
--- a/probe_roms.c
+++ b/probe_roms.c
@@ -35,8 +35,6 @@ static const int rom_len = 0xf0000 - 0xc0000; /* option-rom memory region */
 static int _sigbus;
 static unsigned long rom_align;
 
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
-
 static void sigbus(int sig)
 {
 	_sigbus = 1;
diff --git a/super-ddf.c b/super-ddf.c
index f73a63fe..636d7b49 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -1680,8 +1680,7 @@ static const char *vendors_with_variable_volume_UUID[] = {
 
 static int volume_id_is_reliable(const struct ddf_super *ddf)
 {
-	int n = sizeof(vendors_with_variable_volume_UUID) /
-		sizeof(vendors_with_variable_volume_UUID[0]);
+	int n = ARRAY_SIZE(vendors_with_variable_volume_UUID);
 	int i;
 	for (i = 0; i < n; i++)
 		if (!memcmp(ddf->controller.guid,