NeilBrown: Remove Manage_reconfing in favour of Grow_reshape
Martin F. Krafft
madduck at alioth.debian.org
Wed Jan 27 02:00:45 UTC 2010
Module: mdadm
Branch: build
Commit: d823a6c87225d0c7f96443013798ed4dacf51ff6
URL: http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=d823a6c87225d0c7f96443013798ed4dacf51ff6
Author: NeilBrown <neilb at suse.de>
Date: Tue Jul 14 12:11:31 2009 +1000
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 at suse.de>
---
Manage.c | 18 ------------------
mdadm.c | 4 +---
mdadm.h | 1 -
3 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/Manage.c b/Manage.c
index 65235bc..6bd33b9 100644
--- 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 82e2d43..bac0f35 100644
--- 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 b0a840b..170c24b 100644
--- 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);
More information about the pkg-mdadm-commits
mailing list