From nobody Fri Oct 3 11:32:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579810240; cv=none; d=zohomail.com; s=zohoarc; b=lJltcJdrMhWDwjI6gZt55qqA5Qyy4UsCMUSBA+j4cd/Hv6aPXJrJ3+A0UjPeYcDwAiDTioS9+ZeD4nXP7HFVZ1IZX2qzmgMQ3xGYhY8aNOumeYxYDSai34aHP7tQY9nQaNrUBB5P8Nvhc//XYdw2plADG/Gr9gP4XS/aeMWgu8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579810240; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5oYlmc2Il84lqScujTc5YeXrb+18UGXFy3QmjmDZgzc=; b=R3faEvN3d5KO4RQpcXl1S5mbCn2oYXDeXbgn0/9z6PWhx0kAJ8wI3mhTQovhcVnGNixAV2eVdP/axIJhXhmUhfa0fVl8TpjdwoxEKND37x+cZDi/PTk18kk9BhHgwC7IBuOhXLBOKOAUUCEYxva2ReI3obHo7GYWuhShZ3QRKpE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579810240083220.83869616170637; Thu, 23 Jan 2020 12:10:40 -0800 (PST) Received: from localhost ([::1]:33114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuioI-0008AH-Vv for importer@patchew.org; Thu, 23 Jan 2020 15:10:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufew-00067C-88 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufeu-00006K-R8 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:46 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23240 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 1iufeu-00005q-OB for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:44 -0500 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-322-4yYFpDIDPNupAuei8A2ubA-1; Thu, 23 Jan 2020 11:48:40 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E412692786 for ; Thu, 23 Jan 2020 16:48:39 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E48428991; Thu, 23 Jan 2020 16:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798124; 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=5oYlmc2Il84lqScujTc5YeXrb+18UGXFy3QmjmDZgzc=; b=GUMS4sQwNQYmm7kSHuXSMy4oX8kzbltWRN3+eGFF2tVJiAhmYvYtTEkmeGg4ZsseC6sWtF +wF8+IvuiSUMrMGLVxXD7hELYuNvjz+ET0hT5unlJnS1pnBwgzWiTUX7V3BaEYJ75vL9iM mS+4mwl7nNPMKpXHnNr8PHa5S4TewBI= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 094/108] virtiofsd: do not always set FUSE_FLOCK_LOCKS Date: Thu, 23 Jan 2020 16:46:16 +0000 Message-Id: <20200123164630.91498-95-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: 4yYFpDIDPNupAuei8A2ubA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Peng Tao Right now we always enable it regardless of given commandlines. Fix it by setting the flag relying on the lo->flock bit. Signed-off-by: Peng Tao Reviewed-by: Misono Tomohiro Reviewed-by: Sergio Lopez Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index ab1613586e..ccbbec18b0 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -546,9 +546,14 @@ static void lo_init(void *userdata, struct fuse_conn_i= nfo *conn) fuse_log(FUSE_LOG_DEBUG, "lo_init: activating writeback\n"); conn->want |=3D FUSE_CAP_WRITEBACK_CACHE; } - if (lo->flock && conn->capable & FUSE_CAP_FLOCK_LOCKS) { - fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n"); - conn->want |=3D FUSE_CAP_FLOCK_LOCKS; + if (conn->capable & FUSE_CAP_FLOCK_LOCKS) { + if (lo->flock) { + fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n"); + conn->want |=3D FUSE_CAP_FLOCK_LOCKS; + } else { + fuse_log(FUSE_LOG_DEBUG, "lo_init: disabling flock locks\n"); + conn->want &=3D ~FUSE_CAP_FLOCK_LOCKS; + } } =20 if (conn->capable & FUSE_CAP_POSIX_LOCKS) { --=20 2.24.1