From 656711d935000c161012c25340dbd65a59999dc3 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Fri, 9 May 2014 15:30:04 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/7728 Tested-by: Gluster Build System Reviewed-by: Niels de Vos Reviewed-by: Kaleb KEITHLEY --- api/src/glfs.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'api/src/glfs.c') 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) { -- cgit