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>
This commit is contained in:
NeilBrown 2009-07-14 12:11:31 +10:00
parent 4a06e2c270
commit d823a6c872
3 changed files with 1 additions and 22 deletions

View File

@ -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)
{

View File

@ -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) {

View File

@ -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);