Remove Manage_reconfing in favour of Grow_reshape

Bother Manage_reconfig and Grow_reshape provide for changing
the 'layout' of a faulty array.  This is no necessary.
So discard Manage_reconfig and just use Grow_reshape

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

diff --git a/Manage.c b/Manage.c
index 65235bc1836f5e02c22c3e703cea2f39789b8023..6bd33b9408606c2d9b76186df1ce7fef32c1c00e 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -310,24 +310,6 @@ int Manage_resize(char *devname, int fd, long long size, int raid_disks)
        return 0;
 }
 
-int Manage_reconfig(char *devname, int fd, int layout)
-{
-       mdu_array_info_t info;
-       if (ioctl(fd, GET_ARRAY_INFO, &info) != 0) {
-               fprintf(stderr, Name ": Cannot get array information for %s: %s\n",
-                       devname, strerror(errno));
-               return 1;
-       }
-       info.layout = layout;
-       printf("layout set to %d\n", info.layout);
-       if (ioctl(fd, SET_ARRAY_INFO, &info) != 0) {
-               fprintf(stderr, Name ": Cannot set layout for %s: %s\n",
-                       devname, strerror(errno));
-               return 1;
-       }
-       return 0;
-}
-
 int Manage_subdevs(char *devname, int fd,
                   mddev_dev_t devlist, int verbose)
 {

diff --git a/mdadm.c b/mdadm.c
index 82e2d4383014ad13b1ae8a375409d731926ceb6f..bac0f3581b31830895013ebe808711799e69f900 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1413,9 +1413,7 @@ int main(int argc, char *argv[])
                        fprintf(stderr, Name ": can change at most one of size, raiddisks, bitmap, and layout\n");
                        rv = 1;
                        break;
-               } else if (layout != UnSet)
-                       rv = Manage_reconfig(devlist->devname, mdfd, layout);
-               else if (size >= 0 || raiddisks)
+               } else if (size >= 0 || raiddisks || layout != UnSet)
                        rv = Grow_reshape(devlist->devname, mdfd, quiet, backup_file,
                                          size, level, layout, chunk, raiddisks);
                else if (bitmap_file) {

diff --git a/mdadm.h b/mdadm.h
index b0a840beac45764c07b164e972ebff847a54c759..170c24bbcd3b25451a71b3095db222b20dd56b1e 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -707,7 +707,6 @@ extern int add_dev(const char *name, const struct stat *stb, int flag, struct FT
 extern int Manage_ro(char *devname, int fd, int readonly);
 extern int Manage_runstop(char *devname, int fd, int runstop, int quiet);
 extern int Manage_resize(char *devname, int fd, long long size, int raid_disks);
-extern int Manage_reconfig(char *devname, int fd, int layout);
 extern int Manage_subdevs(char *devname, int fd,
                          mddev_dev_t devlist, int verbose);
 extern int autodetect(void);