cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 8e6473e906dfc7d2a62abaf1ec80ff461e4d201d Mon Sep 17 00:00:00 2001
902636
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
902636
Date: Mon, 27 Jan 2020 19:02:12 +0100
902636
Subject: [PATCH 101/116] virtiofsd: do not always set FUSE_FLOCK_LOCKS
902636
MIME-Version: 1.0
902636
Content-Type: text/plain; charset=UTF-8
902636
Content-Transfer-Encoding: 8bit
902636
902636
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
Message-id: <20200127190227.40942-98-dgilbert@redhat.com>
902636
Patchwork-id: 93551
902636
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 097/112] virtiofsd: do not always set FUSE_FLOCK_LOCKS
902636
Bugzilla: 1694164
902636
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
902636
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
902636
902636
From: Peng Tao <tao.peng@linux.alibaba.com>
902636
902636
Right now we always enable it regardless of given commandlines.
902636
Fix it by setting the flag relying on the lo->flock bit.
902636
902636
Signed-off-by: Peng Tao <tao.peng@linux.alibaba.com>
902636
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
902636
Reviewed-by: Sergio Lopez <slp@redhat.com>
902636
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
(cherry picked from commit e468d4af5f5192ab33283464a9f6933044ce47f7)
902636
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
902636
---
902636
 tools/virtiofsd/passthrough_ll.c | 11 ++++++++---
902636
 1 file changed, 8 insertions(+), 3 deletions(-)
902636
902636
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
902636
index ab16135..ccbbec1 100644
902636
--- a/tools/virtiofsd/passthrough_ll.c
902636
+++ b/tools/virtiofsd/passthrough_ll.c
902636
@@ -546,9 +546,14 @@ static void lo_init(void *userdata, struct fuse_conn_info *conn)
902636
         fuse_log(FUSE_LOG_DEBUG, "lo_init: activating writeback\n");
902636
         conn->want |= FUSE_CAP_WRITEBACK_CACHE;
902636
     }
902636
-    if (lo->flock && conn->capable & FUSE_CAP_FLOCK_LOCKS) {
902636
-        fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n");
902636
-        conn->want |= FUSE_CAP_FLOCK_LOCKS;
902636
+    if (conn->capable & FUSE_CAP_FLOCK_LOCKS) {
902636
+        if (lo->flock) {
902636
+            fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n");
902636
+            conn->want |= FUSE_CAP_FLOCK_LOCKS;
902636
+        } else {
902636
+            fuse_log(FUSE_LOG_DEBUG, "lo_init: disabling flock locks\n");
902636
+            conn->want &= ~FUSE_CAP_FLOCK_LOCKS;
902636
+        }
902636
     }
902636
 
902636
     if (conn->capable & FUSE_CAP_POSIX_LOCKS) {
902636
-- 
902636
1.8.3.1
902636