From 32141c1765967e37d6f1accdf124c166bc103c3b Mon Sep 17 00:00:00 2001

From: Jes Sorensen <jsorensen@fb.com>

Date: Tue, 11 Apr 2017 12:54:26 -0400

Subject: [RHEL7.5 PATCH 070/169] Retire mdassemble

mdassemble doesn't handle container based arrays, no support for sysfs,

etc. It has not been actively maintained for years, so time to send it

off to retirement.

Signed-off-by: Jes Sorensen <jsorensen@fb.com>

---

 Assemble.c    | 21 +++-------------

 Makefile      | 37 ----------------------------

 Manage.c      | 10 +-------

 Monitor.c     |  3 ---

 mdassemble.c  | 79 -----------------------------------------------------------

 super-ddf.c   | 30 -----------------------

 super-gpt.c   |  6 -----

 super-intel.c | 52 +--------------------------------------

 super-mbr.c   |  8 ------

 super0.c      | 11 ---------

 super1.c      | 21 +++-------------

 util.c        | 37 +++-------------------------

 12 files changed, 12 insertions(+), 303 deletions(-)

 delete mode 100644 mdassemble.c

diff --git a/Assemble.c b/Assemble.c

index 0db428f..b828523 100644

--- a/Assemble.c

+++ b/Assemble.c

@@ -222,13 +222,11 @@ static int select_devices(struct mddev_dev *devlist,

 					pr_err("%s is a container, but we are looking for components\n",

 					       devname);

 				tmpdev->used = 2;

-#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)

 			} if (!tst && (tst = super_by_fd(dfd, NULL)) == NULL) {

 				if (report_mismatch)

 					pr_err("not a recognisable container: %s\n",

 					       devname);

 				tmpdev->used = 2;

-#endif

 			} else if (!tst->ss->load_container

 				   || tst->ss->load_container(tst, dfd, NULL)) {

 				if (report_mismatch)

@@ -574,9 +572,7 @@ static int load_devices(struct devs *devices, char *devmap,

 	struct mddev_dev *tmpdev;

 	int devcnt = 0;

 	int nextspare = 0;

-#ifndef MDASSEMBLE

 	int bitmap_done = 0;

-#endif

 	int most_recent = -1;

 	int bestcnt = 0;

 	int *best = *bestp;

@@ -592,7 +588,6 @@ static int load_devices(struct devs *devices, char *devmap,

 		if (tmpdev->used != 1)

 			continue;

 		/* looks like a good enough match to update the super block if needed */

-#ifndef MDASSEMBLE

 		if (c->update) {

 			/* prepare useful information in info structures */

 			struct stat stb2;

@@ -683,9 +678,7 @@ static int load_devices(struct devs *devices, char *devmap,

 				else

 					bitmap_done = 1;

 			}

-		} else

-#endif

-		{

+		} else {

 			dfd = dev_open(devname,

 				       tmpdev->disposition == 'I'

 				       ? O_RDWR : (O_RDWR|O_EXCL));

@@ -1097,7 +1090,6 @@ static int start_array(int mdfd,

 		 * it read-only and let the grow code make it writable.

 		 */

 		int rv;

-#ifndef MDASSEMBLE

 		if (content->reshape_active &&

 		    !(content->reshape_active & RESHAPE_NO_BACKUP) &&

 		    content->delta_disks <= 0) {

@@ -1122,7 +1114,6 @@ static int start_array(int mdfd,

 			rv = sysfs_set_str(content, NULL,

 					   "array_state", "readonly");

 		} else

-#endif

 			rv = ioctl(mdfd, RUN_ARRAY, NULL);

 		reopen_mddev(mdfd); /* drop O_EXCL */

 		if (rv == 0) {

@@ -1506,7 +1497,6 @@ try_again:

 		ioctl(mdfd, STOP_ARRAY, NULL);

 	}

-#ifndef MDASSEMBLE

 	if (content != &info) {

 		/* This is a member of a container.  Try starting the array. */

 		int err;

@@ -1515,7 +1505,7 @@ try_again:

 		close(mdfd);

 		return err;

 	}

-#endif

+

 	/* Ok, no bad inconsistancy, we can try updating etc */

 	devices = xcalloc(num_devs, sizeof(*devices));

 	devmap = xcalloc(num_devs, content->array.raid_disks);

@@ -1668,14 +1658,13 @@ try_again:

 		return 1;

 	}

 	st->ss->getinfo_super(st, content, NULL);

-#ifndef MDASSEMBLE

 	if (sysfs_init(content, mdfd, NULL)) {

 		pr_err("Unable to initialize sysfs\n");

 		close(mdfd);

 		free(devices);

 		return 1;

 	}

-#endif

+

 	/* after reload context, store journal_clean in context */

 	content->journal_clean = journal_clean;

 	for (i=0; i

@@ -1761,7 +1750,6 @@ try_again:

 	 * that was moved aside due to the reshape overwriting live data

 	 * The code of doing this lives in Grow.c

 	 */

-#ifndef MDASSEMBLE

 	if (content->reshape_active &&

 	    !(content->reshape_active & RESHAPE_NO_BACKUP)) {

 		int err = 0;

@@ -1813,7 +1801,6 @@ try_again:

 			return err;

 		}

 	}

-#endif

 	/* Almost ready to actually *do* something */

 	/* First, fill in the map, so that udev can find our name

@@ -1876,7 +1863,6 @@ try_again:

 	return rv == 2 ? 0 : rv;

 }

-#ifndef MDASSEMBLE

 int assemble_container_content(struct supertype *st, int mdfd,

 			       struct mdinfo *content, struct context *c,

 			       char *chosen_name, int *result)

@@ -2119,4 +2105,3 @@ int assemble_container_content(struct supertype *st, int mdfd,

 	return err;

 	/* FIXME should have an O_EXCL and wait for read-auto */

 }

-#endif

diff --git a/Makefile b/Makefile

index 5ff6cc0..a5d2a0a 100644

--- a/Makefile

+++ b/Makefile

@@ -158,18 +158,6 @@ MON_SRCS = $(patsubst %.o,%.c,$(MON_OBJS))

 STATICSRC = pwgr.c

 STATICOBJS = pwgr.o

-ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c policy.c dlink.c util.c \

-	maps.c lib.c xmalloc.c \

-	super0.c super1.c super-ddf.c super-intel.c sha1.c crc32.c sg_io.c mdstat.c \

-	platform-intel.c probe_roms.c sysfs.c super-mbr.c super-gpt.c mapfile.c \

-	crc32c.c

-ASSEMBLE_AUTO_SRCS := mdopen.c

-ASSEMBLE_FLAGS:= $(CFLAGS) -DMDASSEMBLE

-ifdef MDASSEMBLE_AUTO

-ASSEMBLE_SRCS += $(ASSEMBLE_AUTO_SRCS)

-ASSEMBLE_FLAGS += -DMDASSEMBLE_AUTO

-endif

-

 all : mdadm mdmon

 man : mdadm.man md.man mdadm.conf.man mdmon.man raid6check.man

@@ -222,31 +210,6 @@ test_stripe : restripe.c xmalloc.o mdadm.h

 raid6check : raid6check.o mdadm.h $(CHECK_OBJS)

 	$(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)

-mdassemble : $(ASSEMBLE_SRCS) $(INCL)

-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)

-

-mdassemble.diet : $(ASSEMBLE_SRCS) $(INCL)

-	rm -f $(OBJS)

-	$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)

-

-mdassemble.static : $(ASSEMBLE_SRCS) $(INCL)

-	rm -f $(OBJS)

-	$(CC) $(LDFLAGS) $(CPPFLAGS) $(ASSEMBLE_FLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)

-

-mdassemble.auto : $(ASSEMBLE_SRCS) $(INCL) $(ASSEMBLE_AUTO_SRCS)

-	rm -f mdassemble.static

-	$(MAKE) MDASSEMBLE_AUTO=1 mdassemble.static

-	mv mdassemble.static mdassemble.auto

-

-mdassemble.uclibc : $(ASSEMBLE_SRCS) $(INCL)

-	rm -f $(OJS)

-	$(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) $(STATICSRC)

-

-# This doesn't work

-mdassemble.klibc : $(ASSEMBLE_SRCS) $(INCL)

-	rm -f $(OBJS)

-	$(KLIBC_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)

-

 mdadm.8 : mdadm.8.in

 	sed -e 's/{DEFAULT_METADATA}/$(DEFAULT_METADATA)/g' \

 	-e 's,{MAP_PATH},$(MAP_PATH),g'  mdadm.8.in > mdadm.8

diff --git a/Manage.c b/Manage.c

index 9e69132..bb84d28 100644

--- a/Manage.c

+++ b/Manage.c

@@ -41,12 +41,9 @@ int Manage_ro(char *devname, int fd, int readonly)

 	 *

 	 */

 	mdu_array_info_t array;

-#ifndef MDASSEMBLE

 	struct mdinfo *mdi;

-#endif

 	int rv = 0;

-#ifndef MDASSEMBLE

 	/* If this is an externally-managed array, we need to modify the

 	 * metadata_version so that mdmon doesn't undo our change.

 	 */

@@ -90,7 +87,7 @@ int Manage_ro(char *devname, int fd, int readonly)

 		}

 		goto out;

 	}

-#endif

+

 	if (md_get_array_info(fd, &array)) {

 		pr_err("%s does not appear to be active.\n",

 			devname);

@@ -114,14 +111,10 @@ int Manage_ro(char *devname, int fd, int readonly)

 		}

 	}

 out:

-#ifndef MDASSEMBLE

 	sysfs_free(mdi);

-#endif

 	return rv;

 }

-#ifndef MDASSEMBLE

-

 static void remove_devices(char *devnm, char *path)

 {

 	/*

@@ -1802,4 +1795,3 @@ int move_spare(char *from_devname, char *to_devname, dev_t devid)

 	close(fd2);

 	return 0;

 }

-#endif

diff --git a/Monitor.c b/Monitor.c

index 036a561..1f15377 100644

--- a/Monitor.c

+++ b/Monitor.c

@@ -1058,8 +1058,6 @@ int Wait(char *dev)

 	}

 }

-#ifndef MDASSEMBLE

-

 static char *clean_states[] = {

 	"clear", "inactive", "readonly", "read-auto", "clean", NULL };

@@ -1151,4 +1149,3 @@ int WaitClean(char *dev, int sock, int verbose)

 	return rv;

 }

-#endif /* MDASSEMBLE */

diff --git a/mdassemble.c b/mdassemble.c

deleted file mode 100644

index f0833bc..0000000

--- a/mdassemble.c

+++ /dev/null

@@ -1,79 +0,0 @@

-/*

- * mdassemble - assemble Linux "md" devices aka RAID arrays.

- *

- * Copyright (C) 2001-2009 Neil Brown <neilb@suse.de>

- * Copyright (C) 2003 Luca Berra <bluca@vodka.it>

- *

- *

- *    This program is free software; you can redistribute it and/or modify

- *    it under the terms of the GNU General Public License as published by

- *    the Free Software Foundation; either version 2 of the License, or

- *    (at your option) any later version.

- *

- *    This program is distributed in the hope that it will be useful,

- *    but WITHOUT ANY WARRANTY; without even the implied warranty of

- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *    GNU General Public License for more details.

- *

- *    You should have received a copy of the GNU General Public License

- *    along with this program; if not, write to the Free Software

- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

- *    Author: Neil Brown

- *    Email: <neilb@suse.de>

- */

-

-#include "mdadm.h"

-#include "md_p.h"

-

-char const Name[] = "mdassemble";

-

-#ifndef MDASSEMBLE_AUTO

-/* from mdopen.c */

-int open_mddev(char *dev, int report_errors/*unused*/)

-{

-	struct mdu_array_info_s array;

-	int mdfd = open(dev, O_RDONLY);

-	if (mdfd < 0)

-		pr_err("error opening %s: %s\n", dev, strerror(errno));

-	else if (md_get_array_info(mdfd, &array) != 0) {

-		pr_err("%s does not appear to be an md device\n", dev);

-		close(mdfd);

-		mdfd = -1;

-	}

-	return mdfd;

-}

-int create_mddev(char *dev, char *name, int autof/*unused*/, int trustworthy,

-		 char *chosen)

-{

-	return open_mddev(dev, 0);

-}

-#endif

-

-int rv;

-int mdfd = -1;

-

-int main(int argc, char *argv[])

-{

-	struct mddev_ident *array_list =  conf_get_ident(NULL);

-	struct context c = { .freeze_reshape = 1 };

-	if (!array_list) {

-		pr_err("No arrays found in config file\n");

-		rv = 1;

-	} else

-		for (; array_list; array_list = array_list->next) {

-			mdu_array_info_t array;

-			if (strcasecmp(array_list->devname, "<ignore>") == 0)

-				continue;

-			mdfd = open_mddev(array_list->devname, 0);

-			if (mdfd >= 0 && md_get_array_info(mdfd, &array) == 0) {

-				rv |= Manage_ro(array_list->devname, mdfd, -1); /* make it readwrite */

-				continue;

-			}

-			if (mdfd >= 0)

-				close(mdfd);

-			rv |= Assemble(array_list->st, array_list->devname,

-				       array_list, NULL, &c);

-		}

-	return rv;

-}

diff --git a/super-ddf.c b/super-ddf.c

index c6037c1..796eaa5 100644

--- a/super-ddf.c

+++ b/super-ddf.c

@@ -500,7 +500,6 @@ struct ddf_super {

 	} *dlist, *add_list;

 };

-#ifndef MDASSEMBLE

 static int load_super_ddf_all(struct supertype *st, int fd,

 			      void **sbp, char *devname);

 static int get_svd_state(const struct ddf_super *, const struct vcl *);

@@ -518,7 +517,6 @@ static int validate_geometry_ddf_bvd(struct supertype *st,

 				     unsigned long long data_offset,

 				     char *dev, unsigned long long *freesize,

 				     int verbose);

-#endif

 static void free_super_ddf(struct supertype *st);

 static int all_ff(const char *guid);

@@ -1305,8 +1303,6 @@ static struct supertype *match_metadata_desc_ddf(char *arg)

 	return st;

 }

-#ifndef MDASSEMBLE

-

 static mapping_t ddf_state[] = {

 	{ "Optimal", 0},

 	{ "Degraded", 1},

@@ -1355,7 +1351,6 @@ static mapping_t ddf_sec_level[] = {

 	{ "Spanned", DDF_2SPANNED},

 	{ NULL, 0}

 };

-#endif

 static int all_ff(const char *guid)

 {

@@ -1382,7 +1377,6 @@ static const char *guid_str(const char *guid)

 	return (const char *) buf;

 }

-#ifndef MDASSEMBLE

 static void print_guid(char *guid, int tstamp)

 {

 	/* A GUIDs are part (or all) ASCII and part binary.

@@ -1748,7 +1742,6 @@ static void detail_super_ddf(struct supertype *st, char *homehost)

 	printf("     Virtual Disks : %d\n", cnt);

 	printf("\n");

 }

-#endif

 static const char *vendors_with_variable_volume_UUID[] = {

 	"LSI      ",

@@ -1795,7 +1788,6 @@ static void uuid_of_ddf_subarray(const struct ddf_super *ddf,

 	memcpy(uuid, sha, 4*4);

 }

-#ifndef MDASSEMBLE

 static void brief_detail_super_ddf(struct supertype *st)

 {

 	struct mdinfo info;

@@ -1811,7 +1803,6 @@ static void brief_detail_super_ddf(struct supertype *st)

 	fname_from_uuid(st, &info, nbuf,':');

 	printf(" UUID=%s", nbuf + 5);

 }

-#endif

 static int match_home_ddf(struct supertype *st, char *homehost)

 {

@@ -1833,7 +1824,6 @@ static int match_home_ddf(struct supertype *st, char *homehost)

 		ddf->controller.vendor_data[len] == 0);

 }

-#ifndef MDASSEMBLE

 static int find_index_in_bvd(const struct ddf_super *ddf,

 			     const struct vd_config *conf, unsigned int n,

 			     unsigned int *n_bvd)

@@ -1914,7 +1904,6 @@ bad:

 	pr_err("Could't find disk %d in array %u\n", n, inst);

 	return NULL;

 }

-#endif

 static int find_phys(const struct ddf_super *ddf, be32 phys_refnum)

 {

@@ -2274,7 +2263,6 @@ static unsigned int find_vde_by_name(const struct ddf_super *ddf,

 	return DDF_NOTFOUND;

 }

-#ifndef MDASSEMBLE

 static unsigned int find_vde_by_guid(const struct ddf_super *ddf,

 				     const char *guid)

 {

@@ -2286,7 +2274,6 @@ static unsigned int find_vde_by_guid(const struct ddf_super *ddf,

 			return i;

 	return DDF_NOTFOUND;

 }

-#endif

 static int init_super_ddf(struct supertype *st,

 			  mdu_array_info_t *info,

@@ -2507,7 +2494,6 @@ static int chunk_to_shift(int chunksize)

 	return ffs(chunksize/512)-1;

 }

-#ifndef MDASSEMBLE

 struct extent {

 	unsigned long long start, size;

 };

@@ -2608,7 +2594,6 @@ static unsigned long long find_space(

 	free(e);

 	return INVALID_SECTORS;

 }

-#endif

 static int init_super_ddf_bvd(struct supertype *st,

 			      mdu_array_info_t *info,

@@ -2727,7 +2712,6 @@ static int init_super_ddf_bvd(struct supertype *st,

 	return 1;

 }

-#ifndef MDASSEMBLE

 static void add_to_super_ddf_bvd(struct supertype *st,

 				 mdu_disk_info_t *dk, int fd, char *devname,

 				 unsigned long long data_offset)

@@ -3015,7 +2999,6 @@ static int remove_from_super_ddf(struct supertype *st, mdu_disk_info_t *dk)

 	}

 	return 0;

 }

-#endif

 /*

  * This is the write_init_super method for a ddf container.  It is

@@ -3176,7 +3159,6 @@ static int _write_super_to_disk(struct ddf_super *ddf, struct dl *d)

 	return 1;

 }

-#ifndef MDASSEMBLE

 static int __write_init_super_ddf(struct supertype *st)

 {

 	struct ddf_super *ddf = st->sb;

@@ -3259,8 +3241,6 @@ static int write_init_super_ddf(struct supertype *st)

 	}

 }

-#endif

-

 static __u64 avail_size_ddf(struct supertype *st, __u64 devsize,

 			    unsigned long long data_offset)

 {

@@ -3270,8 +3250,6 @@ static __u64 avail_size_ddf(struct supertype *st, __u64 devsize,

 	return devsize - 32*1024*2;

 }

-#ifndef MDASSEMBLE

-

 static int reserve_space(struct supertype *st, int raiddisks,

 			 unsigned long long size, int chunk,

 			 unsigned long long data_offset,

@@ -3653,8 +3631,6 @@ static int load_container_ddf(struct supertype *st, int fd,

 	return load_super_ddf_all(st, fd, &st->sb, devname);

 }

-#endif /* MDASSEMBLE */

-

 static int check_secondary(const struct vcl *vc)

 {

 	const struct vd_config *conf = &vc->conf;

@@ -4075,7 +4051,6 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)

 	return 0;

 }

-#ifndef MDASSEMBLE

 /*

  * A new array 'a' has been started which claims to be instance 'inst'

  * within container 'c'.

@@ -5196,7 +5171,6 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,

 	*updates = mu;

 	return rv;

 }

-#endif /* MDASSEMBLE */

 static int ddf_level_to_layout(int level)

 {

@@ -5225,7 +5199,6 @@ static void default_geometry_ddf(struct supertype *st, int *level, int *layout,

 }

 struct superswitch super_ddf = {

-#ifndef	MDASSEMBLE

 	.examine_super	= examine_super_ddf,

 	.brief_examine_super = brief_examine_super_ddf,

 	.brief_examine_subarrays = brief_examine_subarrays_ddf,

@@ -5239,7 +5212,6 @@ struct superswitch super_ddf = {

 	.load_container	= load_container_ddf,

 	.copy_metadata = copy_metadata_ddf,

 	.kill_subarray  = kill_subarray_ddf,

-#endif

 	.match_home	= match_home_ddf,

 	.uuid_from_super= uuid_from_super_ddf,

 	.getinfo_super  = getinfo_super_ddf,

@@ -5259,7 +5231,6 @@ struct superswitch super_ddf = {

 	.external	= 1,

-#ifndef MDASSEMBLE

 /* for mdmon */

 	.open_new       = ddf_open_new,

 	.set_array_state= ddf_set_array_state,

@@ -5268,6 +5239,5 @@ struct superswitch super_ddf = {

 	.process_update	= ddf_process_update,

 	.prepare_update	= ddf_prepare_update,

 	.activate_spare = ddf_activate_spare,

-#endif

 	.name = "ddf",

 };

diff --git a/super-gpt.c b/super-gpt.c

index bb38a97..a1e9aa9 100644

--- a/super-gpt.c

+++ b/super-gpt.c

@@ -47,7 +47,6 @@ static void free_gpt(struct supertype *st)

 	st->sb = NULL;

 }

-#ifndef MDASSEMBLE

 static void examine_gpt(struct supertype *st, char *homehost)

 {

 	struct GPT *gpt = st->sb + 512;

@@ -66,7 +65,6 @@ static void examine_gpt(struct supertype *st, char *homehost)

 			);

 	}

 }

-#endif /* MDASSEMBLE */

 static int load_gpt(struct supertype *st, int fd, char *devname)

 {

@@ -199,7 +197,6 @@ static struct supertype *match_metadata_desc(char *arg)

 	return st;

 }

-#ifndef MDASSEMBLE

 static int validate_geometry(struct supertype *st, int level,

 			     int layout, int raiddisks,

 			     int *chunk, unsigned long long size,

@@ -210,13 +207,10 @@ static int validate_geometry(struct supertype *st, int level,

 	pr_err("gpt metadata cannot be used this way\n");

 	return 0;

 }

-#endif

 struct superswitch gpt = {

-#ifndef MDASSEMBLE

 	.examine_super = examine_gpt,

 	.validate_geometry = validate_geometry,

-#endif

 	.match_metadata_desc = match_metadata_desc,

 	.load_super = load_gpt,

 	.store_super = store_gpt,

diff --git a/super-intel.c b/super-intel.c

index 84dfe2b..0aed57c 100644

--- a/super-intel.c

+++ b/super-intel.c

@@ -260,9 +260,7 @@ struct bbm_log {

 	struct bbm_log_entry marked_block_entries[BBM_LOG_MAX_ENTRIES];

 } __attribute__ ((__packed__));

-#ifndef MDASSEMBLE

 static char *map_state_str[] = { "normal", "uninitialized", "degraded", "failed" };

-#endif

 #define BLOCKS_PER_KB	(1024/512)

@@ -672,12 +670,10 @@ static struct supertype *match_metadata_desc_imsm(char *arg)

 	return st;

 }

-#ifndef MDASSEMBLE

 static __u8 *get_imsm_version(struct imsm_super *mpb)

 {

 	return &mpb->sig[MPB_SIG_LEN];

 }

-#endif

 /* retrieve a disk directly from the anchor when the anchor is known to be

  * up-to-date, currently only at load time

@@ -784,7 +780,6 @@ static size_t sizeof_imsm_dev(struct imsm_dev *dev, int migr_state)

 	return size;

 }

-#ifndef MDASSEMBLE

 /* retrieve disk serial number list from a metadata update */

 static struct disk_info *get_disk_info(struct imsm_update_create_array *update)

 {

@@ -796,7 +791,6 @@ static struct disk_info *get_disk_info(struct imsm_update_create_array *update)

 	return inf;

 }

-#endif

 static struct imsm_dev *__get_imsm_dev(struct imsm_super *mpb, __u8 index)

 {

@@ -847,7 +841,6 @@ static inline struct bbm_log_block_addr __cpu_to_le48(unsigned long long sec)

 	return addr;

 }

-#ifndef MDASSEMBLE

 /* get size of the bbm log */

 static __u32 get_imsm_bbm_log_size(struct bbm_log *log)

 {

@@ -978,7 +971,6 @@ static int clear_badblock(struct bbm_log *log, const __u8 idx, const unsigned

 	return 1;

 }

-#endif /* MDASSEMBLE */

 /* allocate and load BBM log from metadata */

 static int load_bbm_log(struct intel_super *super)

@@ -1423,7 +1415,6 @@ static int is_gen_migration(struct imsm_dev *dev);

 #define IMSM_4K_DIV 8

-#ifndef MDASSEMBLE

 static __u64 blocks_per_migr_unit(struct intel_super *super,

 				  struct imsm_dev *dev);

@@ -1698,7 +1689,6 @@ void examine_migr_rec_imsm(struct intel_super *super)

 		break;

 	}

 }

-#endif /* MDASSEMBLE */

 void convert_from_4k_imsm_migr_rec(struct intel_super *super)

 {

@@ -1858,7 +1848,6 @@ static int imsm_check_attributes(__u32 attributes)

 	return ret_val;

 }

-#ifndef MDASSEMBLE

 static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info, char *map);

 static void examine_super_imsm(struct supertype *st, char *homehost)

@@ -2572,8 +2561,6 @@ static int export_detail_platform_imsm(int verbose, char *controller_path)

 	return result;

 }

-#endif

-

 static int match_home_imsm(struct supertype *st, char *homehost)

 {

 	/* the imsm metadata format does not specify any host

@@ -2984,7 +2971,6 @@ out:

 	return retval;

 }

-#ifndef MDASSEMBLE

 /*******************************************************************************

  * function: imsm_create_metadata_checkpoint_update

  * Description: It creates update for checkpoint change.

@@ -3125,7 +3111,6 @@ static int write_imsm_migr_rec(struct supertype *st)

 		close(fd);

 	return retval;

 }

-#endif /* MDASSEMBLE */

 /* spare/missing disks activations are not allowe when