From 028d82b8a2434cb6d5ad707500f6dea2125ea2fa Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Fri, 7 Jul 2017 07:49:45 -0700 Subject: gfapi+libglusterfs: fix mem_pools_fini without mem_pools_init case The change consists of two parts: make sure it doesn't happen (in glfs.c), and make it harmless if it does (in mem-pool.c). Change-Id: Icb7dda7a45dd3d1ade2ee3991bb6a22c8ec88424 BUG: 1468863 Signed-off-by: Jeff Darcy Reviewed-on: https://review.gluster.org/17728 Tested-by: Jeff Darcy CentOS-regression: Gluster Build System Smoke: Gluster Build System Reviewed-by: Jeff Darcy --- api/src/glfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'api') diff --git a/api/src/glfs.c b/api/src/glfs.c index 5c77a63d101..0eb25a222de 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -745,6 +745,12 @@ pub_glfs_new (const char *volname) return NULL; } + /* + * Do this as soon as possible in case something else depends on + * pool allocations. + */ + mem_pools_init (); + fs = glfs_new_fs (volname); if (!fs) return NULL; @@ -1026,12 +1032,6 @@ pub_glfs_init (struct glfs *fs) return ret; } - /* - * Do this as soon as possible in case something else depends on - * pool allocations. - */ - mem_pools_init (); - __GLFS_ENTRY_VALIDATE_FS (fs, invalid_fs); ret = glfs_init_common (fs); -- cgit