|
 |
1d442bb |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
1d442bb |
Date: Mon, 27 Jan 2020 19:01:53 +0000
|
|
|
1d442bb |
Subject: [PATCH] virtiofsd: Clean up inodes on destroy
|
|
|
1d442bb |
MIME-Version: 1.0
|
|
|
1d442bb |
Content-Type: text/plain; charset=UTF-8
|
|
|
1d442bb |
Content-Transfer-Encoding: 8bit
|
|
|
1d442bb |
|
|
|
1d442bb |
Clear out our inodes and fd's on a 'destroy' - so we get rid
|
|
|
1d442bb |
of them if we reboot the guest.
|
|
|
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 771b01eb76ff480fee984bd1d21727147cc3e702)
|
|
|
1d442bb |
---
|
|
|
1d442bb |
tools/virtiofsd/passthrough_ll.c | 26 ++++++++++++++++++++++++++
|
|
|
1d442bb |
1 file changed, 26 insertions(+)
|
|
|
1d442bb |
|
|
|
1d442bb |
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
|
|
1d442bb |
index b176a314d6..9ed77a17fd 100644
|
|
|
1d442bb |
--- a/tools/virtiofsd/passthrough_ll.c
|
|
|
1d442bb |
+++ b/tools/virtiofsd/passthrough_ll.c
|
|
|
1d442bb |
@@ -1169,6 +1169,25 @@ static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inode,
|
|
|
1d442bb |
}
|
|
|
1d442bb |
}
|
|
|
1d442bb |
|
|
|
1d442bb |
+static int unref_all_inodes_cb(gpointer key, gpointer value, gpointer user_data)
|
|
|
1d442bb |
+{
|
|
|
1d442bb |
+ struct lo_inode *inode = value;
|
|
|
1d442bb |
+ struct lo_data *lo = user_data;
|
|
|
1d442bb |
+
|
|
|
1d442bb |
+ inode->refcount = 0;
|
|
|
1d442bb |
+ lo_map_remove(&lo->ino_map, inode->fuse_ino);
|
|
|
1d442bb |
+ close(inode->fd);
|
|
|
1d442bb |
+
|
|
|
1d442bb |
+ return TRUE;
|
|
|
1d442bb |
+}
|
|
|
1d442bb |
+
|
|
|
1d442bb |
+static void unref_all_inodes(struct lo_data *lo)
|
|
|
1d442bb |
+{
|
|
|
1d442bb |
+ pthread_mutex_lock(&lo->mutex);
|
|
|
1d442bb |
+ g_hash_table_foreach_remove(lo->inodes, unref_all_inodes_cb, lo);
|
|
|
1d442bb |
+ pthread_mutex_unlock(&lo->mutex);
|
|
|
1d442bb |
+}
|
|
|
1d442bb |
+
|
|
|
1d442bb |
static void lo_forget_one(fuse_req_t req, fuse_ino_t ino, uint64_t nlookup)
|
|
|
1d442bb |
{
|
|
|
1d442bb |
struct lo_data *lo = lo_data(req);
|
|
|
1d442bb |
@@ -2035,6 +2054,12 @@ static void lo_lseek(fuse_req_t req, fuse_ino_t ino, off_t off, int whence,
|
|
|
1d442bb |
}
|
|
|
1d442bb |
}
|
|
|
1d442bb |
|
|
|
1d442bb |
+static void lo_destroy(void *userdata)
|
|
|
1d442bb |
+{
|
|
|
1d442bb |
+ struct lo_data *lo = (struct lo_data *)userdata;
|
|
|
1d442bb |
+ unref_all_inodes(lo);
|
|
|
1d442bb |
+}
|
|
|
1d442bb |
+
|
|
|
1d442bb |
static struct fuse_lowlevel_ops lo_oper = {
|
|
|
1d442bb |
.init = lo_init,
|
|
|
1d442bb |
.lookup = lo_lookup,
|
|
|
1d442bb |
@@ -2073,6 +2098,7 @@ static struct fuse_lowlevel_ops lo_oper = {
|
|
|
1d442bb |
.copy_file_range = lo_copy_file_range,
|
|
|
1d442bb |
#endif
|
|
|
1d442bb |
.lseek = lo_lseek,
|
|
|
1d442bb |
+ .destroy = lo_destroy,
|
|
|
1d442bb |
};
|
|
|
1d442bb |
|
|
|
1d442bb |
/* Print vhost-user.json backend program capabilities */
|