58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
|
From 8e6473e906dfc7d2a62abaf1ec80ff461e4d201d Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
||
|
|
Date: Mon, 27 Jan 2020 19:02:12 +0100
|
||
|
|
Subject: [PATCH 101/116] virtiofsd: do not always set FUSE_FLOCK_LOCKS
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
Message-id: <20200127190227.40942-98-dgilbert@redhat.com>
|
||
|
|
Patchwork-id: 93551
|
||
|
|
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 097/112] virtiofsd: do not always set FUSE_FLOCK_LOCKS
|
||
|
|
Bugzilla: 1694164
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
||
|
|
|
||
|
|
From: Peng Tao <tao.peng@linux.alibaba.com>
|
||
|
|
|
||
|
|
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 <tao.peng@linux.alibaba.com>
|
||
|
|
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
|
||
|
|
Reviewed-by: Sergio Lopez <slp@redhat.com>
|
||
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
(cherry picked from commit e468d4af5f5192ab33283464a9f6933044ce47f7)
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
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 ab16135..ccbbec1 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_info *conn)
|
||
|
|
fuse_log(FUSE_LOG_DEBUG, "lo_init: activating writeback\n");
|
||
|
|
conn->want |= 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 |= 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 |= FUSE_CAP_FLOCK_LOCKS;
|
||
|
|
+ } else {
|
||
|
|
+ fuse_log(FUSE_LOG_DEBUG, "lo_init: disabling flock locks\n");
|
||
|
|
+ conn->want &= ~FUSE_CAP_FLOCK_LOCKS;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
if (conn->capable & FUSE_CAP_POSIX_LOCKS) {
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|