[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/8] virtiofsd: Changed allocations of fuse_session to GLib's fun
From: |
Mahmoud Mandour |
Subject: |
[PATCH 4/8] virtiofsd: Changed allocations of fuse_session to GLib's functions |
Date: |
Fri, 19 Mar 2021 15:25:23 +0200 |
Replaced the allocation and deallocation of fuse_session structs
from calloc() and free() calls to g_new0() and g_free().
Removed the NULL-check and used g_new0() mainly because fuse_session
creation is critical and an exit will occur anyway if fuse_session
allocation failed.
Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
---
tools/virtiofsd/fuse_lowlevel.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index 45527ff703..b0e9ef29a7 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -2467,7 +2467,7 @@ void fuse_session_destroy(struct fuse_session *se)
free(se->vu_socket_path);
se->vu_socket_path = NULL;
- free(se);
+ g_free(se);
}
@@ -2490,11 +2490,7 @@ struct fuse_session *fuse_session_new(struct fuse_args
*args,
return NULL;
}
- se = (struct fuse_session *)calloc(1, sizeof(struct fuse_session));
- if (se == NULL) {
- fuse_log(FUSE_LOG_ERR, "fuse: failed to allocate fuse object\n");
- goto out1;
- }
+ se = g_new0(struct fuse_session, 1);
se->fd = -1;
se->vu_listen_fd = -1;
se->thread_pool_size = THREAD_POOL_SIZE;
@@ -2550,7 +2546,7 @@ struct fuse_session *fuse_session_new(struct fuse_args
*args,
out4:
fuse_opt_free_args(args);
out2:
- free(se);
+ g_free(se);
out1:
return NULL;
}
--
2.25.1
- [PATCH 0/8] virtiofsd: Changed various allocations to GLib functions, Mahmoud Mandour, 2021/03/19
- [PATCH 4/8] virtiofsd: Changed allocations of fuse_session to GLib's functions,
Mahmoud Mandour <=
- [PATCH 3/8] virtiofsd: Changed fuse_pollhandle allocation to GLib's functions, Mahmoud Mandour, 2021/03/19
- [PATCH 6/8] virtiofsd: Changed allocations of fv_VuDev & its internals to GLib functions, Mahmoud Mandour, 2021/03/19
- [PATCH 7/8] virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions, Mahmoud Mandour, 2021/03/19
- [PATCH 5/8] virtiofsd: Changed allocation of lo_map_elems to GLib's functions, Mahmoud Mandour, 2021/03/19
- [PATCH 8/8] virtiofsd/fuse_virtio.c: Changed allocations of locals to GLib, Mahmoud Mandour, 2021/03/19