54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
|
From 485adfa1aa1b3e2d1449edf5c42d6ec396cbfb5d Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
||
|
|
Date: Mon, 27 Jan 2020 19:01:40 +0100
|
||
|
|
Subject: [PATCH 069/116] virtiofsd: Handle reinit
|
||
|
|
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-66-dgilbert@redhat.com>
|
||
|
|
Patchwork-id: 93520
|
||
|
|
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 065/112] virtiofsd: Handle reinit
|
||
|
|
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: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
||
|
|
|
||
|
|
Allow init->destroy->init for mount->umount->mount
|
||
|
|
|
||
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
(cherry picked from commit c806d6435fe95fd54b379920aca2f4e3ea1f3258)
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
tools/virtiofsd/fuse_lowlevel.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
|
||
|
|
index a7a1968..7d742b5 100644
|
||
|
|
--- a/tools/virtiofsd/fuse_lowlevel.c
|
||
|
|
+++ b/tools/virtiofsd/fuse_lowlevel.c
|
||
|
|
@@ -2028,6 +2028,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
|
||
|
|
}
|
||
|
|
|
||
|
|
se->got_init = 1;
|
||
|
|
+ se->got_destroy = 0;
|
||
|
|
if (se->op.init) {
|
||
|
|
se->op.init(se->userdata, &se->conn);
|
||
|
|
}
|
||
|
|
@@ -2130,6 +2131,7 @@ static void do_destroy(fuse_req_t req, fuse_ino_t nodeid,
|
||
|
|
(void)iter;
|
||
|
|
|
||
|
|
se->got_destroy = 1;
|
||
|
|
+ se->got_init = 0;
|
||
|
|
if (se->op.destroy) {
|
||
|
|
se->op.destroy(se->userdata);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|