From c5321286e540153ff04d189b20c2957776e2b7d5 Mon Sep 17 00:00:00 2001 From: Anand Avati Date: Fri, 10 Jun 2011 04:37:53 +0000 Subject: cluster/afr: propagate proper errno returned by lock fops If locks could not be held on any of the servers, then propagate the errno returned by the lock FOPs instead of hardcoding EAGAIN/EINVAL. Signed-off-by: Anand Avati BUG: 2993 ([glusterfs-3.2.0qa2]: hang while doing the selfheal) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2993 --- xlators/cluster/afr/src/afr-lk-common.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c index b068b2182..4b1aa6c7c 100644 --- a/xlators/cluster/afr/src/afr-lk-common.c +++ b/xlators/cluster/afr/src/afr-lk-common.c @@ -928,8 +928,6 @@ afr_lock_blocking (call_frame_t *frame, xlator_t *this, int child_index) local->op_ret = -1; int_lock->lock_op_ret = -1; - local->op_errno = EINVAL; - int_lock->lock_op_errno = EINVAL; afr_copy_locked_nodes (frame, this); @@ -963,8 +961,6 @@ afr_lock_blocking (call_frame_t *frame, xlator_t *this, int child_index) local->op_ret = -1; int_lock->lock_op_ret = -1; - local->op_errno = EAGAIN; - int_lock->lock_op_errno = EAGAIN; afr_copy_locked_nodes (frame, this); -- cgit