summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2017-07-14 13:17:48 +0200
committerNiels de Vos <ndevos@redhat.com>2017-07-14 19:17:59 +0000
commit6ed8518cfa352f53b84a511f3618b50ba4a42853 (patch)
treeeafa0ed4d339f21ffd041cde3a27fb40b0e6ff9b
parent2b290b50457ce2bd37f18d516c665abc1e96d2d6 (diff)
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 <ndevos@redhat.com> Reviewed-on: https://review.gluster.org/17778 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Jeff Darcy <jeff@pl.atyp.us> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
-rw-r--r--libglusterfs/src/ctx.c4
-rw-r--r--libglusterfs/src/glusterfs.h2
2 files changed, 5 insertions, 1 deletions
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;