From patchwork Tue Jan 21 12:23:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 1226538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=U2C+iKLj; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4828Wn2ht5z9sP3 for ; Wed, 22 Jan 2020 00:29:08 +1100 (AEDT) Received: from localhost ([::1]:53820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ittab-0006gX-OW for incoming@patchwork.ozlabs.org; Tue, 21 Jan 2020 08:29:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52452) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itsgV-0002aL-2R for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:31:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itsgN-0004MK-R6 for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:31:05 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:25014 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1itsgN-0004MD-GR for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:30:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579609859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QbMS0kP6iKeNqu2Mv7H+soNaPN09g0beLkqrgUlqAWQ=; b=U2C+iKLjGFlTVGVzmExAo9PaB4ud5jJp/egn6l3carspsKBU5kUsent63gBS7ODYe9Xo/Q aAzfWAmc7CRVSfEqpIWSTrJmztLJ5+x/z2c+iubpdzpKCFG/t7lk9JK5JWe0GwZHYOELxt ivj/WRCbZfA+X2qgv+Z1RMS+RHV6ZUo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-117-q6YIOOoyOnukdUWNzaMZZA-1; Tue, 21 Jan 2020 07:30:57 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 603428C7A53; Tue, 21 Jan 2020 12:30:56 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 933ED60BE0; Tue, 21 Jan 2020 12:30:54 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com, berrange@redhat.com, slp@redhat.com, philmd@redhat.com Subject: [PATCH v2 073/109] virtiofsd: extract root inode init into setup_root() Date: Tue, 21 Jan 2020 12:23:57 +0000 Message-Id: <20200121122433.50803-74-dgilbert@redhat.com> In-Reply-To: <20200121122433.50803-1-dgilbert@redhat.com> References: <20200121122433.50803-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: q6YIOOoyOnukdUWNzaMZZA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: m.mizuma@jp.fujitsu.com, misono.tomohiro@jp.fujitsu.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Miklos Szeredi Inititialize the root inode in a single place. Signed-off-by: Miklos Szeredi Signed-off-by: Stefan Hajnoczi dgilbert: with fix suggested by Misono Tomohiro Reviewed-by: Misono Tomohiro --- 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 2d2c10ada9..f71085bf1b 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -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);