From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F824C2D0DB for ; Thu, 23 Jan 2020 13:02:26 +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 DB6A724125 for ; Thu, 23 Jan 2020 13:02:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="B1mfcGfa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB6A724125 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuc7s-0004nA-Ic for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 08:02:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40146) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iub8i-0001uI-58 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iub8g-0004uJ-3E for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:12 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37240 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 1iub8f-0004tf-Vf for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780749; 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=7tel/nd2zE/ZyJVWTivJ5OAyTm2pwU+ekwsLBhz3zxc=; b=B1mfcGfaTNBdEM1QRqvXOSKMcPtdlRBZnJiMnERIyseLROQeo+u7wXLLnNUzwGsckkrCQl wfRwpThr3ilLaZHHcdWfVlG+TeGycux+M7FDbkUQGAf9l3ej3hdFLhHxCiVzNmxCa6N/pX 04mP/epi8W2ifhhLcQHQjLplAk9Ckh0= 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-143-JErQefTdPYutvwsrjReenA-1; Thu, 23 Jan 2020 06:59:07 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7EDA18010C9 for ; Thu, 23 Jan 2020 11:59:06 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id A88691CB; Thu, 23 Jan 2020 11:59:05 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 015/111] virtiofsd: Make fsync work even if only inode is passed in Date: Thu, 23 Jan 2020 11:57:05 +0000 Message-Id: <20200123115841.138849-16-dgilbert@redhat.com> In-Reply-To: <20200123115841.138849-1-dgilbert@redhat.com> References: <20200123115841.138849-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: JErQefTdPYutvwsrjReenA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Vivek Goyal If caller has not sent file handle in request, then using inode, retrieve the fd opened using O_PATH and use that to open file again and issue fsync. This will be needed when dax_flush() calls fsync. At that time we only have inode information (and not file). Signed-off-by: Vivek Goyal Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_lowlevel.c | 6 +++++- tools/virtiofsd/passthrough_ll.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index 514d79cb24..8552cfb8af 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -1075,7 +1075,11 @@ static void do_fsync(fuse_req_t req, fuse_ino_t node= id, const void *inarg) fi.fh =3D arg->fh; =20 if (req->se->op.fsync) { - req->se->op.fsync(req, nodeid, datasync, &fi); + if (fi.fh =3D=3D (uint64_t)-1) { + req->se->op.fsync(req, nodeid, datasync, NULL); + } else { + req->se->op.fsync(req, nodeid, datasync, &fi); + } } else { fuse_reply_err(req, ENOSYS); } diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 6c4da18075..26ac87013b 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -903,10 +903,34 @@ static void lo_fsync(fuse_req_t req, fuse_ino_t ino, = int datasync, { int res; (void)ino; + int fd; + char *buf; + + fuse_log(FUSE_LOG_DEBUG, "lo_fsync(ino=3D%" PRIu64 ", fi=3D0x%p)\n", i= no, + (void *)fi); + + if (!fi) { + res =3D asprintf(&buf, "/proc/self/fd/%i", lo_fd(req, ino)); + if (res =3D=3D -1) { + return (void)fuse_reply_err(req, errno); + } + + fd =3D open(buf, O_RDWR); + free(buf); + if (fd =3D=3D -1) { + return (void)fuse_reply_err(req, errno); + } + } else { + fd =3D fi->fh; + } + if (datasync) { - res =3D fdatasync(fi->fh); + res =3D fdatasync(fd); } else { - res =3D fsync(fi->fh); + res =3D fsync(fd); + } + if (!fi) { + close(fd); } fuse_reply_err(req, res =3D=3D -1 ? errno : 0); } --=20 2.24.1