From patchwork Mon Oct 21 10:58:14 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: 1180494 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=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Zr/PtHRV"; 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 46xYvZ3mJ6z9sP6 for ; Mon, 21 Oct 2019 22:15:06 +1100 (AEDT) Received: from localhost ([::1]:38026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVeR-0001kg-U9 for incoming@patchwork.ozlabs.org; Mon, 21 Oct 2019 07:15:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46402) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVPt-0003d8-9a for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVPs-0003wO-6d for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:01 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:40426 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 1iMVPs-0003wE-2d for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655599; 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=Uq3dVPpkMY0sp1aV3tXLcOQPKVgrUBg6UKecjOlmPkI=; b=Zr/PtHRVS9Bp1vOp0YtuoZBvxYevRfrhNQ+Z3OFqiy/+Ot81U7Qn1zkHRGur3ioKUZkZbP MltzAoZ/ovkJ9WONo/RdZe88VYDK3ZGUDCpVP6wy1hLJI2fwpe8VZBIwKv4qh+jIpH/joJ 2jgPq1dDNVWzkUVzZ1+5hrVcup0lsSw= 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-255-GNg4UOQ9O8eLkhLtwQzcTg-1; Mon, 21 Oct 2019 06:59:54 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99DFB476; Mon, 21 Oct 2019 10:59:53 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB1E364029; Mon, 21 Oct 2019 10:59:51 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, mst@redhat.com, marcandre.lureau@redhat.com, stefanha@redhat.com Subject: [PATCH 12/30] virtiofsd: Make fsync work even if only inode is passed in Date: Mon, 21 Oct 2019 11:58:14 +0100 Message-Id: <20191021105832.36574-13-dgilbert@redhat.com> In-Reply-To: <20191021105832.36574-1-dgilbert@redhat.com> References: <20191021105832.36574-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: GNg4UOQ9O8eLkhLtwQzcTg-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.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: piaojun@huawei.com, eguan@linux.alibaba.com, vgoyal@Redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 --- contrib/virtiofsd/fuse_lowlevel.c | 9 ++++++--- contrib/virtiofsd/passthrough_ll.c | 24 ++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/contrib/virtiofsd/fuse_lowlevel.c b/contrib/virtiofsd/fuse_lowlevel.c index ff68ec0c9d..6fe7506ead 100644 --- a/contrib/virtiofsd/fuse_lowlevel.c +++ b/contrib/virtiofsd/fuse_lowlevel.c @@ -1083,9 +1083,12 @@ static void do_fsync(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) memset(&fi, 0, sizeof(fi)); fi.fh = arg->fh; - if (req->se->op.fsync) - req->se->op.fsync(req, nodeid, datasync, &fi); - else + if (req->se->op.fsync) { + if (fi.fh == (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/contrib/virtiofsd/passthrough_ll.c b/contrib/virtiofsd/passthrough_ll.c index 72fae9d10b..63a32c87c3 100644 --- a/contrib/virtiofsd/passthrough_ll.c +++ b/contrib/virtiofsd/passthrough_ll.c @@ -863,10 +863,30 @@ 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=%" PRIu64 ", fi=0x%p)\n", ino, + (void *)fi); + + if (!fi) { + res = asprintf(&buf, "/proc/self/fd/%i", lo_fd(req, ino)); + if (res == -1) + return (void) fuse_reply_err(req, errno); + + fd = open(buf, O_RDWR); + free(buf); + if (fd == -1) + return (void) fuse_reply_err(req, errno); + } else + fd = fi->fh; + if (datasync) - res = fdatasync(fi->fh); + res = fdatasync(fd); else - res = fsync(fi->fh); + res = fsync(fd); + if (!fi) + close(fd); fuse_reply_err(req, res == -1 ? errno : 0); }