summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorHumble Chirammal <hchiramm@redhat.com>2014-05-09 15:30:04 +0530
committerVijay Bellur <vbellur@redhat.com>2014-11-15 10:13:06 -0800
commit656711d935000c161012c25340dbd65a59999dc3 (patch)
tree98bc3ee2dee7e96af87d6d240430f5b613179355 /api
parent8c4ae34f8803f44f2f1e459883581a953bca42ec (diff)
mem_acct : Check return value of xlator_mem_acct_init().
some code does not check xlator_mem_acct_init() return, thus fails to capture wrong memory accounting initialization. This patch fix the same. Change-Id: I01eab19d6cef472afd850b0f964132c01523492a BUG: 1123768 Signed-off-by: Humble Chirammal <hchiramm@redhat.com> Reviewed-on: http://review.gluster.org/7728 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'api')
-rw-r--r--api/src/glfs.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/api/src/glfs.c b/api/src/glfs.c
index fc0e7c7ba91..e74329caf9d 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -66,11 +66,15 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
call_pool_t *pool = NULL;
int ret = -1;
- xlator_mem_acct_init (THIS, glfs_mt_end + 1);
-
if (!ctx) {
goto err;
- }
+ }
+ ret = xlator_mem_acct_init (THIS, glfs_mt_end + 1);
+ if (ret != 0) {
+ gf_log(THIS->name, GF_LOG_ERROR,
+ "Memory accounting init failed");
+ return ret;
+ }
ctx->process_uuid = generate_glusterfs_ctx_id ();
if (!ctx->process_uuid) {