diff options
author | Dan Williams <dan.j.williams@intel.com> | 2010-07-01 17:36:05 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-07-01 17:36:05 -0700 |
commit | 8cfc801c72f079618b39d04c2e0fe32adbc2474e (patch) | |
tree | 061c0e2348bd7fab99ca774fbcf758ebf997ae06 /mdmon.c | |
parent | 6a0ee6a0770e8b2ae2a2bbe79896d4ecb083e218 (diff) | |
parent | aa534678baad80689a642ba1bd602a00a267ac03 (diff) | |
download | mdadm-8cfc801c72f079618b39d04c2e0fe32adbc2474e.tar.gz mdadm-8cfc801c72f079618b39d04c2e0fe32adbc2474e.tar.xz mdadm-8cfc801c72f079618b39d04c2e0fe32adbc2474e.zip |
Merge branch 'subarray' into for-neil
Conflicts:
mdadm.h
super-intel.c
Diffstat (limited to 'mdmon.c')
-rw-r--r-- | mdmon.c | 25 |
1 files changed, 2 insertions, 23 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]; @@ -414,9 +393,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); } |