From patchwork Thu Dec 12 16:38:31 2019 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: 11288927 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4F0D112B for ; Thu, 12 Dec 2019 17:48:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7C6F82067C for ; Thu, 12 Dec 2019 17:48:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bpqgfPDG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C6F82067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:34924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifSZX-00034p-Fj for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 Dec 2019 12:48:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57741) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifRWM-0006sx-Uy for qemu-devel@nongnu.org; Thu, 12 Dec 2019 11:40:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifRWL-0003Xq-Jf for qemu-devel@nongnu.org; Thu, 12 Dec 2019 11:40:58 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:25199 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifRWL-0003Wx-FS for qemu-devel@nongnu.org; Thu, 12 Dec 2019 11:40:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576168857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3rW2XGe5T1gT7ap3lFIinyIujzfUTI6CCW9PjxWRgvA=; b=bpqgfPDGgpa8ffK5QrZbYRONgoK+mjEmJNlwRkmwlGiUb16SeskGrpMbuGZiwCt98wPA+y F+70UzQtU5D6F3B/vST9ozWWhqC1p2OEhqByw3quGjHcb5hDzgBB6uVclZuUeYOczmcZJO u8bcEY0b9N5KY0jCriadWNtQWCEsQlY= 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-105-FAW7eAaIOciGzmf4_aE3dg-1; Thu, 12 Dec 2019 11:40:55 -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 BD821102C85E for ; Thu, 12 Dec 2019 16:40:54 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-226.ams2.redhat.com [10.36.116.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5E1460BE1; Thu, 12 Dec 2019 16:40:53 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com Subject: [PATCH 071/104] virtiofsd: extract root inode init into setup_root() Date: Thu, 12 Dec 2019 16:38:31 +0000 Message-Id: <20191212163904.159893-72-dgilbert@redhat.com> In-Reply-To: <20191212163904.159893-1-dgilbert@redhat.com> References: <20191212163904.159893-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: FAW7eAaIOciGzmf4_aE3dg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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 Reviewed-by: Sergio Lopez --- tools/virtiofsd/passthrough_ll.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index ef8b88e3d1..0f33c3c5e9 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2336,6 +2336,29 @@ 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->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); @@ -2411,8 +2434,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; @@ -2480,6 +2501,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);