| From 983b383bc4a92a9f7ecff0332cadefed2f58f502 Mon Sep 17 00:00:00 2001 |
| From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> |
| Date: Mon, 27 Jan 2020 19:01:50 +0100 |
| Subject: [PATCH 079/116] virtiofsd: extract root inode init into setup_root() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com> |
| Message-id: <20200127190227.40942-76-dgilbert@redhat.com> |
| Patchwork-id: 93527 |
| O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 075/112] virtiofsd: extract root inode init into setup_root() |
| Bugzilla: 1694164 |
| RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com> |
| RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com> |
| RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com> |
| |
| From: Miklos Szeredi <mszeredi@redhat.com> |
| |
| 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> |
| (cherry picked from commit 3ca8a2b1c83eb185c232a4e87abbb65495263756) |
| |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| tools/virtiofsd/passthrough_ll.c | 35 +++++++++++++++++++++++++---------- |
| 1 file changed, 25 insertions(+), 10 deletions(-) |
| |
| diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c |
| index 33bfb4d..9e7191e 100644 |
| |
| |
| @@ -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[]) |
| { |
| struct fuse_args args = FUSE_ARGS_INIT(argc, argv); |
| @@ -2426,8 +2450,6 @@ int main(int argc, char *argv[]) |
| if (lo.debug) { |
| current_log_level = FUSE_LOG_DEBUG; |
| } |
| - lo.root.refcount = 2; |
| - |
| if (lo.source) { |
| struct stat stat; |
| int res; |
| @@ -2446,7 +2468,6 @@ int main(int argc, char *argv[]) |
| } else { |
| lo.source = "/"; |
| } |
| - lo.root.is_symlink = false; |
| if (!lo.timeout_set) { |
| switch (lo.cache) { |
| case CACHE_NEVER: |
| @@ -2466,13 +2487,6 @@ int main(int argc, char *argv[]) |
| 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); |
| if (se == NULL) { |
| goto err_out1; |
| @@ -2495,6 +2509,7 @@ int main(int argc, char *argv[]) |
| |
| setup_sandbox(&lo, se, opts.syslog); |
| |
| + setup_root(&lo, &lo.root); |
| /* Block until ctrl+c or fusermount -u */ |
| ret = virtio_loop(se); |
| |
| -- |
| 1.8.3.1 |
| |