openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virtiofsd: Fix fuse_daemonize ignored return values 

QEMU's compiler enables warnings/errors for ignored values
and the (void) trick used in the fuse code isn't enough.
Turn all the return values into a return value on the function.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2019-02-08 16:05:24 +00:00
parent 8c3fe75e03
commit 30d8e49760
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tools/virtiofsd/helper.c
View File

@ -10,12 +10,10 @@
* See the file COPYING.LIB. * See the file COPYING.LIB.
*/ */
#include "config.h"
#include "fuse_i.h" #include "fuse_i.h"
#include "fuse_lowlevel.h" #include "fuse_lowlevel.h"
#include "fuse_misc.h" #include "fuse_misc.h"
#include "fuse_opt.h" #include "fuse_opt.h"
#include "mount_util.h"
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
@ -171,6 +169,7 @@ int fuse_parse_cmdline(struct fuse_args *args, struct fuse_cmdline_opts *opts)
int fuse_daemonize(int foreground) int fuse_daemonize(int foreground)
{ {
int ret = 0, rett;
if (!foreground) { if (!foreground) {
int nullfd; int nullfd;
int waiter[2]; int waiter[2];
@ -192,8 +191,8 @@ int fuse_daemonize(int foreground)
case 0: case 0:
break; break;
default: default:
(void)read(waiter[0], &completed, sizeof(completed)); _exit(read(waiter[0], &completed,
_exit(0); sizeof(completed) != sizeof(completed)));
} }
if (setsid() == -1) { if (setsid() == -1) {
@ -201,13 +200,22 @@ int fuse_daemonize(int foreground)
return -1; return -1;
} }
(void)chdir("/"); ret = chdir("/");
nullfd = open("/dev/null", O_RDWR, 0); nullfd = open("/dev/null", O_RDWR, 0);
if (nullfd != -1) { if (nullfd != -1) {
(void)dup2(nullfd, 0); rett = dup2(nullfd, 0);
(void)dup2(nullfd, 1); if (!ret) {
(void)dup2(nullfd, 2); ret = rett;
}
rett = dup2(nullfd, 1);
if (!ret) {
ret = rett;
}
rett = dup2(nullfd, 2);
if (!ret) {
ret = rett;
}
if (nullfd > 2) { if (nullfd > 2) {
close(nullfd); close(nullfd);
} }
@ -215,13 +223,16 @@ int fuse_daemonize(int foreground)
/* Propagate completion of daemon initialization */ /* Propagate completion of daemon initialization */
completed = 1; completed = 1;
(void)write(waiter[1], &completed, sizeof(completed)); rett = write(waiter[1], &completed, sizeof(completed));
if (!ret) {
ret = rett;
}
close(waiter[0]); close(waiter[0]);
close(waiter[1]); close(waiter[1]);
} else { } else {
(void)chdir("/"); ret = chdir("/");
} }
return 0; return ret;
} }
void fuse_apply_conn_info_opts(struct fuse_conn_info_opts *opts, void fuse_apply_conn_info_opts(struct fuse_conn_info_opts *opts,