2016-07-14 02:51:30

by Kinglong Mee

Subject: [PATCH 2/2] blkmapd: unlink pid file when error out

Fix some error out without unlink pid file.

Signed-off-by: Kinglong Mee <[email protected]>
---
utils/blkmapd/device-discovery.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
index 50e2746..8eb3fd0 100644
--- a/utils/blkmapd/device-discovery.c
+++ b/utils/blkmapd/device-discovery.c
@@ -486,13 +486,13 @@ int main(int argc, char **argv)
signal(SIGHUP, SIG_IGN);

if (dflag) {
- bl_discover_devices();
- exit(0);
+ ret = bl_discover_devices();
+ goto out;
}

if ((bl_watch_fd = inotify_init()) < 0) {
BL_LOG_ERR("init inotify failed %s\n", strerror(errno));
- exit(1);
+ goto out;
}

/* open pipe file */
@@ -513,7 +513,7 @@ int main(int argc, char **argv)
BL_LOG_ERR("inquiry process return %d\n", ret);
}
}
-
+out:
if (pidfd >= 0) {
close(pidfd);
unlink(PID_FILE);
--
2.7.4

2016-07-20 15:14:18

by Steve Dickson

Subject: Re: [PATCH 2/2] blkmapd: unlink pid file when error out

On 07/13/2016 10:51 PM, Kinglong Mee wrote:
> Fix some error out without unlink pid file.
>
> Signed-off-by: Kinglong Mee <[email protected]>
Committed...

steved.

> ---
> utils/blkmapd/device-discovery.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
> index 50e2746..8eb3fd0 100644
> --- a/utils/blkmapd/device-discovery.c
> +++ b/utils/blkmapd/device-discovery.c
> @@ -486,13 +486,13 @@ int main(int argc, char **argv)
> signal(SIGHUP, SIG_IGN);
>
> if (dflag) {
> - bl_discover_devices();
> - exit(0);
> + ret = bl_discover_devices();
> + goto out;
> }
>
> if ((bl_watch_fd = inotify_init()) < 0) {
> BL_LOG_ERR("init inotify failed %s\n", strerror(errno));
> - exit(1);
> + goto out;
> }
>
> /* open pipe file */
> @@ -513,7 +513,7 @@ int main(int argc, char **argv)
> BL_LOG_ERR("inquiry process return %d\n", ret);
> }
> }
> -
> +out:
> if (pidfd >= 0) {
> close(pidfd);
> unlink(PID_FILE);
>