|
 |
1d442bb |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
1d442bb |
Date: Mon, 27 Jan 2020 19:01:41 +0000
|
|
|
1d442bb |
Subject: [PATCH] virtiofsd: Handle hard reboot
|
|
|
1d442bb |
MIME-Version: 1.0
|
|
|
1d442bb |
Content-Type: text/plain; charset=UTF-8
|
|
|
1d442bb |
Content-Transfer-Encoding: 8bit
|
|
|
1d442bb |
|
|
|
1d442bb |
Handle a
|
|
|
1d442bb |
mount
|
|
|
1d442bb |
hard reboot (without unmount)
|
|
|
1d442bb |
mount
|
|
|
1d442bb |
|
|
|
1d442bb |
we get another 'init' which FUSE doesn't normally expect.
|
|
|
1d442bb |
|
|
|
1d442bb |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1d442bb |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
1d442bb |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1d442bb |
(cherry picked from commit e8556f49098b5d95634e592d79a97f761b76c96e)
|
|
|
1d442bb |
---
|
|
|
1d442bb |
tools/virtiofsd/fuse_lowlevel.c | 16 +++++++++++++++-
|
|
|
1d442bb |
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
|
1d442bb |
|
|
|
1d442bb |
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
|
|
|
1d442bb |
index 7d742b5a72..65f91dabae 100644
|
|
|
1d442bb |
--- a/tools/virtiofsd/fuse_lowlevel.c
|
|
|
1d442bb |
+++ b/tools/virtiofsd/fuse_lowlevel.c
|
|
|
1d442bb |
@@ -2433,7 +2433,21 @@ void fuse_session_process_buf_int(struct fuse_session *se,
|
|
|
1d442bb |
goto reply_err;
|
|
|
1d442bb |
}
|
|
|
1d442bb |
} else if (in->opcode == FUSE_INIT || in->opcode == CUSE_INIT) {
|
|
|
1d442bb |
- goto reply_err;
|
|
|
1d442bb |
+ if (fuse_lowlevel_is_virtio(se)) {
|
|
|
1d442bb |
+ /*
|
|
|
1d442bb |
+ * TODO: This is after a hard reboot typically, we need to do
|
|
|
1d442bb |
+ * a destroy, but we can't reply to this request yet so
|
|
|
1d442bb |
+ * we can't use do_destroy
|
|
|
1d442bb |
+ */
|
|
|
1d442bb |
+ fuse_log(FUSE_LOG_DEBUG, "%s: reinit\n", __func__);
|
|
|
1d442bb |
+ se->got_destroy = 1;
|
|
|
1d442bb |
+ se->got_init = 0;
|
|
|
1d442bb |
+ if (se->op.destroy) {
|
|
|
1d442bb |
+ se->op.destroy(se->userdata);
|
|
|
1d442bb |
+ }
|
|
|
1d442bb |
+ } else {
|
|
|
1d442bb |
+ goto reply_err;
|
|
|
1d442bb |
+ }
|
|
|
1d442bb |
}
|
|
|
1d442bb |
|
|
|
1d442bb |
err = EACCES;
|