From 5459e74ef28bd08e48f95c2732f04144fdbbee56 Mon Sep 17 00:00:00 2001 From: linbaiye Date: Fri, 28 Sep 2012 18:56:26 +0800 Subject: Preventing client crashing as the callings of GF_CALLOC has been failed. As the callings of GF_CALLOC can seldom come to a failure, glusterfs client will crash due to segment fault. We should have returned once the variables of transaction's local can't be alloced. Change-Id: Ia3798b8349d832b23c7825e64dbad93ebe29cd1b BUG: 861335 Signed-off-by: linbaiye Reviewed-on: http://review.gluster.org/4005 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- xlators/cluster/afr/src/afr-common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'xlators/cluster/afr/src/afr-common.c') diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 4130adc6f..21272c0d7 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -2618,8 +2618,11 @@ afr_flush (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) op_errno = -ret; goto out; } - afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION); - + ret = afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION); + if (ret < 0) { + op_errno = -ret; + goto out; + } ret = 0; out: -- cgit