diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2016-07-20 11:02:03 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2016-07-20 11:12:10 -0400 |
| commit | 6e79a74d7936fc1d1bbe20e2a7abd6def40c00ea (patch) | |
| tree | 54487a4247d130ab632ba0ee1859792fb48aa049 | |
| parent | 0018969f7814d95abe6a1eda40218fd374b064fa (diff) | |
| download | nfs-utils-6e79a74d7936fc1d1bbe20e2a7abd6def40c00ea.tar.gz nfs-utils-6e79a74d7936fc1d1bbe20e2a7abd6def40c00ea.tar.xz nfs-utils-6e79a74d7936fc1d1bbe20e2a7abd6def40c00ea.zip | |
blkmapd: Let running correctly when pid file exists
Blkmapd cannot run until blkmapd.pid is unlinked.
This patch lets checking exists based on lockf without stat.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/blkmapd/device-discovery.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c index 052d582..50e2746 100644 --- a/utils/blkmapd/device-discovery.c +++ b/utils/blkmapd/device-discovery.c @@ -436,7 +436,6 @@ static void usage(void) int main(int argc, char **argv) { int opt, dflag = 0, fg = 0, ret = 1; - struct stat statbuf; char pidbuf[64]; while ((opt = getopt(argc, argv, "hdf")) != -1) { @@ -460,11 +459,6 @@ int main(int argc, char **argv) if (fg) { openlog("blkmapd", LOG_PERROR, 0); } else { - if (!stat(PID_FILE, &statbuf)) { - fprintf(stderr, "Pid file %s already existed\n", PID_FILE); - exit(1); - } - if (daemon(0, 0) != 0) { fprintf(stderr, "Daemonize failed\n"); exit(1); @@ -478,7 +472,7 @@ int main(int argc, char **argv) } if (lockf(pidfd, F_TLOCK, 0) < 0) { - BL_LOG_ERR("Lock pid file %s failed\n", PID_FILE); + BL_LOG_ERR("Already running; Exiting!"); close(pidfd); exit(1); } |