diff options
author | NeilBrown <neilb@suse.de> | 2010-02-04 14:49:32 +1100 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2010-02-04 16:37:21 +1100 |
commit | 24cfdbc5c0b6a1ccae28ffb10a707160525f18c6 (patch) | |
tree | f764dd31286363435dbe75382f439e7dcffe531b /mdmon.c | |
parent | 688a1e5b07dc46ae10aeafbda61c1700ad09551b (diff) |
mdmon: discard test_pidfile()
devname2mdmon() can be used just as easily and doing so saves us from
some duplicate code.
Also tidy up some related logic.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'mdmon.c')
-rw-r--r-- | mdmon.c | 16 |
1 files changed, 4 insertions, 12 deletions
@@ -113,15 +113,6 @@ static struct superswitch *find_metadata_methods(char *vers) return NULL; } -static int test_pidfile(char *devname) -{ - char path[100]; - struct stat st; - - sprintf(path, "/var/run/mdadm/%s.pid", devname); - return stat(path, &st); -} - int make_pidfile(char *devname, int o_excl) { char path[100]; @@ -529,13 +520,14 @@ static int mdmon(char *devname, int devnum, int must_fork, char *switchroot) } ignore = chdir("/"); - if (victim < 0 && test_pidfile(container->devname) == 0) { + if (victim < 0) { if (ping_monitor(container->devname) == 0) { fprintf(stderr, "mdmon: %s already managed\n", container->devname); exit(3); - } else if (victim < 0) - victim = devname2mdmon(container->devname); + } + /* if there is a pid file, kill whoever is there just in case */ + victim = devname2mdmon(container->devname); } if (container->ss->load_super(container, mdfd, devname)) { fprintf(stderr, "mdmon: Cannot load metadata for %s\n", |