diff options
author | NeilBrown <neilb@suse.de> | 2010-07-06 14:46:47 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2010-07-06 14:46:47 +1000 |
commit | 1538aca5cbbd99be47657e0ca0b7e2186426a1b1 (patch) | |
tree | f4750261bcd916a5714154d310c6a9e87769c7f0 /mdmon.c | |
parent | 7d2e6486e34180215e4859c3b342246dfc6c07a0 (diff) | |
parent | d19e3cfb6627c40e3a28454ebc2098c0e19b9a77 (diff) | |
download | mdadm-1538aca5cbbd99be47657e0ca0b7e2186426a1b1.tar.gz mdadm-1538aca5cbbd99be47657e0ca0b7e2186426a1b1.tar.xz mdadm-1538aca5cbbd99be47657e0ca0b7e2186426a1b1.zip |
Merge branch 'master' of git://github.com/djbw/mdadm
Diffstat (limited to 'mdmon.c')
-rw-r--r-- | mdmon.c | 28 |
1 files changed, 3 insertions, 25 deletions
@@ -104,15 +104,6 @@ int __clone2(int (*fn)(void *), return mon_tid; } -static struct superswitch *find_metadata_methods(char *vers) -{ - if (strcmp(vers, "ddf") == 0) - return &super_ddf; - if (strcmp(vers, "imsm") == 0) - return &super_imsm; - return NULL; -} - static int make_pidfile(char *devname) { char path[100]; @@ -136,18 +127,6 @@ static int make_pidfile(char *devname) return 0; } -int is_container_member(struct mdstat_ent *mdstat, char *container) -{ - if (mdstat->metadata_version == NULL || - strncmp(mdstat->metadata_version, "external:", 9) != 0 || - !is_subarray(mdstat->metadata_version+9) || - strncmp(mdstat->metadata_version+10, container, strlen(container)) != 0 || - mdstat->metadata_version[10+strlen(container)] != '/') - return 0; - - return 1; -} - static void try_kill_monitor(pid_t pid, char *devname, int sock) { char buf[100]; @@ -394,8 +373,7 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) exit(3); } - mdi = sysfs_read(mdfd, container->devnum, - GET_VERSION|GET_LEVEL|GET_DEVS|SKIP_GONE_DEVS); + mdi = sysfs_read(mdfd, container->devnum, GET_VERSION|GET_LEVEL|GET_DEVS); if (!mdi) { fprintf(stderr, "mdmon: failed to load sysfs info for %s\n", @@ -414,9 +392,9 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) exit(3); } - container->ss = find_metadata_methods(mdi->text_version); + container->ss = version_to_superswitch(mdi->text_version); if (container->ss == NULL) { - fprintf(stderr, "mdmon: %s uses unknown metadata: %s\n", + fprintf(stderr, "mdmon: %s uses unsupported metadata: %s\n", devname, mdi->text_version); exit(3); } |