ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtiofsd: extract root inode init into setup_root() 

Inititialize the root inode in a single place.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
dgilbert:
with fix suggested by Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Miklos Szeredi 2019-11-20 14:25:50 +00:00 committed by Dr. David Alan Gilbert
parent 9de4fab599
commit 3ca8a2b1c8
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/virtiofsd/passthrough_ll.c
View File

@ -2351,6 +2351,30 @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
} }
} }
static void setup_root(struct lo_data *lo, struct lo_inode *root)
{
int fd, res;
struct stat stat;
fd = open("/", O_PATH);
if (fd == -1) {
fuse_log(FUSE_LOG_ERR, "open(%s, O_PATH): %m\n", lo->source);
exit(1);
}
res = fstatat(fd, "", &stat, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW);
if (res == -1) {
fuse_log(FUSE_LOG_ERR, "fstatat(%s): %m\n", lo->source);
exit(1);
}
root->is_symlink = false;
root->fd = fd;
root->ino = stat.st_ino;
root->dev = stat.st_dev;
root->refcount = 2;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct fuse_args args = FUSE_ARGS_INIT(argc, argv); struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
@ -2426,8 +2450,6 @@ int main(int argc, char *argv[])
if (lo.debug) { if (lo.debug) {
current_log_level = FUSE_LOG_DEBUG; current_log_level = FUSE_LOG_DEBUG;
} }
lo.root.refcount = 2;
if (lo.source) { if (lo.source) {
struct stat stat; struct stat stat;
int res; int res;
@ -2446,7 +2468,6 @@ int main(int argc, char *argv[])
} else { } else {
lo.source = "/"; lo.source = "/";
} }
lo.root.is_symlink = false;
if (!lo.timeout_set) { if (!lo.timeout_set) {
switch (lo.cache) { switch (lo.cache) {
case CACHE_NEVER: case CACHE_NEVER:
@ -2466,13 +2487,6 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
lo.root.fd = open(lo.source, O_PATH);
if (lo.root.fd == -1) {
fuse_log(FUSE_LOG_ERR, "open(\"%s\", O_PATH): %m\n", lo.source);
exit(1);
}
se = fuse_session_new(&args, &lo_oper, sizeof(lo_oper), &lo); se = fuse_session_new(&args, &lo_oper, sizeof(lo_oper), &lo);
if (se == NULL) { if (se == NULL) {
goto err_out1; goto err_out1;
@ -2495,6 +2509,7 @@ int main(int argc, char *argv[])
setup_sandbox(&lo, se, opts.syslog); setup_sandbox(&lo, se, opts.syslog);
setup_root(&lo, &lo.root);
/* Block until ctrl+c or fusermount -u */ /* Block until ctrl+c or fusermount -u */
ret = virtio_loop(se); ret = virtio_loop(se);