|
 |
22c213 |
From 485adfa1aa1b3e2d1449edf5c42d6ec396cbfb5d Mon Sep 17 00:00:00 2001
|
|
|
22c213 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
22c213 |
Date: Mon, 27 Jan 2020 19:01:40 +0100
|
|
|
22c213 |
Subject: [PATCH 069/116] virtiofsd: Handle reinit
|
|
|
22c213 |
MIME-Version: 1.0
|
|
|
22c213 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c213 |
Content-Transfer-Encoding: 8bit
|
|
|
22c213 |
|
|
|
22c213 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
Message-id: <20200127190227.40942-66-dgilbert@redhat.com>
|
|
|
22c213 |
Patchwork-id: 93520
|
|
|
22c213 |
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 065/112] virtiofsd: Handle reinit
|
|
|
22c213 |
Bugzilla: 1694164
|
|
|
22c213 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
Allow init->destroy->init for mount->umount->mount
|
|
|
22c213 |
|
|
|
22c213 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
22c213 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
(cherry picked from commit c806d6435fe95fd54b379920aca2f4e3ea1f3258)
|
|
|
22c213 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
22c213 |
---
|
|
|
22c213 |
tools/virtiofsd/fuse_lowlevel.c | 2 ++
|
|
|
22c213 |
1 file changed, 2 insertions(+)
|
|
|
22c213 |
|
|
|
22c213 |
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
|
|
|
22c213 |
index a7a1968..7d742b5 100644
|
|
|
22c213 |
--- a/tools/virtiofsd/fuse_lowlevel.c
|
|
|
22c213 |
+++ b/tools/virtiofsd/fuse_lowlevel.c
|
|
|
22c213 |
@@ -2028,6 +2028,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
|
|
|
22c213 |
}
|
|
|
22c213 |
|
|
|
22c213 |
se->got_init = 1;
|
|
|
22c213 |
+ se->got_destroy = 0;
|
|
|
22c213 |
if (se->op.init) {
|
|
|
22c213 |
se->op.init(se->userdata, &se->conn);
|
|
|
22c213 |
}
|
|
|
22c213 |
@@ -2130,6 +2131,7 @@ static void do_destroy(fuse_req_t req, fuse_ino_t nodeid,
|
|
|
22c213 |
(void)iter;
|
|
|
22c213 |
|
|
|
22c213 |
se->got_destroy = 1;
|
|
|
22c213 |
+ se->got_init = 0;
|
|
|
22c213 |
if (se->op.destroy) {
|
|
|
22c213 |
se->op.destroy(se->userdata);
|
|
|
22c213 |
}
|
|
|
22c213 |
--
|
|
|
22c213 |
1.8.3.1
|
|
|
22c213 |
|