From 6ed8518cfa352f53b84a511f3618b50ba4a42853 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 14 Jul 2017 13:17:48 +0200 Subject: mem-pool: remove references to unused ctx->mempool_list Only the old (removed) implementation of mem-pools provided access to the ctx->mempool_list to faciliate state-dumps. The usage of the mempool_list has been disabled with "#if defined(OLD_MEM_POOLS)", but a few occurences were missed. Change-Id: I912fb63830efc06247eb0c6551d198271ee57a86 BUG: 1470170 Signed-off-by: Niels de Vos Reviewed-on: https://review.gluster.org/17778 Reviewed-by: Kaleb KEITHLEY Smoke: Gluster Build System Reviewed-by: Jeff Darcy CentOS-regression: Gluster Build System --- libglusterfs/src/ctx.c | 4 +++- libglusterfs/src/glusterfs.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/ctx.c b/libglusterfs/src/ctx.c index 365c6c087ee..94c56acdea5 100644 --- a/libglusterfs/src/ctx.c +++ b/libglusterfs/src/ctx.c @@ -31,7 +31,9 @@ glusterfs_ctx_new () ctx->mem_acct_enable = gf_global_mem_acct_enable_get(); INIT_LIST_HEAD (&ctx->graphs); - INIT_LIST_HEAD (&ctx->mempool_list); +#if defined(OLD_MEM_POOLS) + INIT_LIST_HEAD (&ctx->mempool_list); +#endif INIT_LIST_HEAD (&ctx->volfile_list); ctx->daemon_pipe[0] = -1; diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index 4bb166ee2fd..19e4ee6ec16 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -494,9 +494,11 @@ struct _glusterfs_ctx { int process_mode; /*mode in which process is runninng*/ struct syncenv *env; /* The env pointer to the synctasks */ +#if defined(OLD_MEM_POOLS) struct list_head mempool_list; /* used to keep a global list of mempools, used to log details of mempool in statedump */ +#endif char *statedump_path; struct mem_pool *dict_pool; -- cgit