ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtiofsd: add helper for lo_data cleanup 

This offers an helper function for lo_data's cleanup.

Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Liu Bo 2019-06-07 05:43:56 +08:00 committed by Dr. David Alan Gilbert
parent eb68a33b5f
commit 18a69cbbb6
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tools/virtiofsd/passthrough_ll.c
View File

@ -2407,6 +2407,26 @@ static gboolean lo_key_equal(gconstpointer a, gconstpointer b)
return la->ino == lb->ino && la->dev == lb->dev; return la->ino == lb->ino && la->dev == lb->dev;
} }
static void fuse_lo_data_cleanup(struct lo_data *lo)
{
if (lo->inodes) {
g_hash_table_destroy(lo->inodes);
}
lo_map_destroy(&lo->fd_map);
lo_map_destroy(&lo->dirp_map);
lo_map_destroy(&lo->ino_map);
if (lo->proc_self_fd >= 0) {
close(lo->proc_self_fd);
}
if (lo->root.fd >= 0) {
close(lo->root.fd);
}
free(lo->source);
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct fuse_args args = FUSE_ARGS_INIT(argc, argv); struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
@ -2554,22 +2574,7 @@ err_out2:
err_out1: err_out1:
fuse_opt_free_args(&args); fuse_opt_free_args(&args);
if (lo.inodes) { fuse_lo_data_cleanup(&lo);
g_hash_table_destroy(lo.inodes);
}
lo_map_destroy(&lo.fd_map);
lo_map_destroy(&lo.dirp_map);
lo_map_destroy(&lo.ino_map);
if (lo.proc_self_fd >= 0) {
close(lo.proc_self_fd);
}
if (lo.root.fd >= 0) {
close(lo.root.fd);
}
free(lo.source);
return ret ? 1 : 0; return ret ? 1 : 0;
} }