From 6a2f83caad7ff882e3a8da5fdec4be8ceccbfdc2 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Mon, 27 Aug 2018 18:19:58 +0530 Subject: coverity: multiple fixes CID: 1390477, 1124827 updates: bz#789278 Change-Id: I41060d131aec6e58e7267ac8531b29a70f8c4359 Signed-off-by: Amar Tumballi --- glusterfsd/src/glusterfsd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'glusterfsd/src') diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 81a73344d6b..c3fea207b6e 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -1642,6 +1642,9 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx) struct rlimit lim = {0, }; int ret = -1; + if (!ctx) + return ret; + ret = xlator_mem_acct_init (THIS, gfd_mt_end); if (ret != 0) { gf_msg(THIS->name, GF_LOG_CRITICAL, 0, glusterfsd_msg_34, @@ -1774,7 +1777,7 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx) ret = 0; out: - if (ret && ctx) { + if (ret) { if (ctx->pool) { mem_pool_destroy (ctx->pool->frame_mem_pool); mem_pool_destroy (ctx->pool->stack_mem_pool); -- cgit