84 lines
2.8 KiB
Diff
84 lines
2.8 KiB
Diff
|
From: Eryu Guan <eguan@linux.alibaba.com>
|
||
|
|
Date: Mon, 27 Jan 2020 19:02:13 +0000
|
||
|
|
Subject: [PATCH] virtiofsd: convert more fprintf and perror to use fuse log
|
||
|
|
infra
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Signed-off-by: Eryu Guan <eguan@linux.alibaba.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
(cherry picked from commit fc1aed0bf96259d0b46b1cfea7497b7762c4ee3d)
|
||
|
|
---
|
||
|
|
tools/virtiofsd/fuse_signals.c | 7 +++++--
|
||
|
|
tools/virtiofsd/helper.c | 9 ++++++---
|
||
|
|
2 files changed, 11 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tools/virtiofsd/fuse_signals.c b/tools/virtiofsd/fuse_signals.c
|
||
|
|
index dc7c8ac025..f18625b6e2 100644
|
||
|
|
--- a/tools/virtiofsd/fuse_signals.c
|
||
|
|
+++ b/tools/virtiofsd/fuse_signals.c
|
||
|
|
@@ -12,6 +12,7 @@
|
||
|
|
#include "fuse_i.h"
|
||
|
|
#include "fuse_lowlevel.h"
|
||
|
|
|
||
|
|
+#include <errno.h>
|
||
|
|
#include <signal.h>
|
||
|
|
#include <stdio.h>
|
||
|
|
#include <stdlib.h>
|
||
|
|
@@ -47,13 +48,15 @@ static int set_one_signal_handler(int sig, void (*handler)(int), int remove)
|
||
|
|
sa.sa_flags = 0;
|
||
|
|
|
||
|
|
if (sigaction(sig, NULL, &old_sa) == -1) {
|
||
|
|
- perror("fuse: cannot get old signal handler");
|
||
|
|
+ fuse_log(FUSE_LOG_ERR, "fuse: cannot get old signal handler: %s\n",
|
||
|
|
+ strerror(errno));
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (old_sa.sa_handler == (remove ? handler : SIG_DFL) &&
|
||
|
|
sigaction(sig, &sa, NULL) == -1) {
|
||
|
|
- perror("fuse: cannot set signal handler");
|
||
|
|
+ fuse_log(FUSE_LOG_ERR, "fuse: cannot set signal handler: %s\n",
|
||
|
|
+ strerror(errno));
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
return 0;
|
||
|
|
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
|
||
|
|
index 33749bfcb7..f98d8f2eb2 100644
|
||
|
|
--- a/tools/virtiofsd/helper.c
|
||
|
|
+++ b/tools/virtiofsd/helper.c
|
||
|
|
@@ -208,7 +208,8 @@ int fuse_daemonize(int foreground)
|
||
|
|
char completed;
|
||
|
|
|
||
|
|
if (pipe(waiter)) {
|
||
|
|
- perror("fuse_daemonize: pipe");
|
||
|
|
+ fuse_log(FUSE_LOG_ERR, "fuse_daemonize: pipe: %s\n",
|
||
|
|
+ strerror(errno));
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -218,7 +219,8 @@ int fuse_daemonize(int foreground)
|
||
|
|
*/
|
||
|
|
switch (fork()) {
|
||
|
|
case -1:
|
||
|
|
- perror("fuse_daemonize: fork");
|
||
|
|
+ fuse_log(FUSE_LOG_ERR, "fuse_daemonize: fork: %s\n",
|
||
|
|
+ strerror(errno));
|
||
|
|
return -1;
|
||
|
|
case 0:
|
||
|
|
break;
|
||
|
|
@@ -228,7 +230,8 @@ int fuse_daemonize(int foreground)
|
||
|
|
}
|
||
|
|
|
||
|
|
if (setsid() == -1) {
|
||
|
|
- perror("fuse_daemonize: setsid");
|
||
|
|
+ fuse_log(FUSE_LOG_ERR, "fuse_daemonize: setsid: %s\n",
|
||
|
|
+ strerror(errno));
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|