summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2013-10-23 13:39:18 +0000
committerAnand Avati <avati@redhat.com>2013-10-24 13:56:13 -0700
commit93c49c6e8c443426792b8e6cf24805516fdcc9bd (patch)
tree88e29a86fb2797b9e0b035ad04dd87c486bff424
parent3033d9c7b4e981a39df76ba066b98f659a1f5045 (diff)
gfapi: fix mem-types initialisation
... and also fill the body of mem_acct_init(). Change-Id: I457d0629c20f999dd2f50e710c75b1c7575b6c19 BUG: 1021904 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/6134 Reviewed-by: Amar Tumballi <amarts@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--api/src/glfs-master.c13
-rw-r--r--api/src/glfs-mem-types.h2
-rw-r--r--api/src/glfs.c2
3 files changed, 15 insertions, 2 deletions
diff --git a/api/src/glfs-master.c b/api/src/glfs-master.c
index 09a92b7..c02534c 100644
--- a/api/src/glfs-master.c
+++ b/api/src/glfs-master.c
@@ -24,6 +24,7 @@
#include "glusterfs.h"
#include "glfs-internal.h"
+#include "glfs-mem-types.h"
int
@@ -114,6 +115,18 @@ notify (xlator_t *this, int event, void *data, ...)
int
mem_acct_init (xlator_t *this)
{
+ int ret = -1;
+
+ if (!this)
+ return ret;
+
+ ret = xlator_mem_acct_init (this, glfs_mt_end + 1);
+ if (ret) {
+ gf_log (this->name, GF_LOG_ERROR, "Failed to initialise "
+ "memory accounting");
+ return ret;
+ }
+
return 0;
}
diff --git a/api/src/glfs-mem-types.h b/api/src/glfs-mem-types.h
index ae47915..25b155b 100644
--- a/api/src/glfs-mem-types.h
+++ b/api/src/glfs-mem-types.h
@@ -16,7 +16,7 @@
#define GF_MEM_TYPE_START (gf_common_mt_end + 1)
enum glfs_mem_types_ {
- glfs_mt_glfs_t,
+ glfs_mt_glfs_t = GF_MEM_TYPE_START,
glfs_mt_call_pool_t,
glfs_mt_xlator_t,
glfs_mt_glfs_fd_t,
diff --git a/api/src/glfs.c b/api/src/glfs.c
index 2466011..ed731ea 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -66,7 +66,7 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
call_pool_t *pool = NULL;
int ret = -1;
- xlator_mem_acct_init (THIS, glfs_mt_end);
+ xlator_mem_acct_init (THIS, glfs_mt_end + 1);
ctx->process_uuid = generate_glusterfs_ctx_id ();
if (!ctx->process_uuid) {