diff options
| author | Anand Avati <avati@redhat.com> | 2013-08-28 22:54:35 -0700 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-08-29 03:35:44 -0700 |
| commit | c8ccfda3a7af1552419ba4f9dfb719fbf0e3f211 (patch) | |
| tree | 3ba07598f90c9a16d4164468e821b7ed18837c0d | |
| parent | bf63e7c6a3fa1bfceb14acf5504b0d52833f7118 (diff) | |
cluster/afr: unlock before aborting transaction
Else this results in a missing frame causing a hang
Change-Id: Ib5f3dc6a3999449faa2853cee2944af2fb065a20
BUG: 1002399
Signed-off-by: Anand Avati <avati@redhat.com>
Reviewed-on: http://review.gluster.org/5731
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | xlators/cluster/afr/src/afr-lk-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c index 116e1ef6983..4d19a0f8312 100644 --- a/xlators/cluster/afr/src/afr-lk-common.c +++ b/xlators/cluster/afr/src/afr-lk-common.c @@ -1329,6 +1329,7 @@ afr_nonblocking_entrylk (call_frame_t *frame, xlator_t *this) local->op_errno = EINVAL; int_lock->lock_op_errno = EINVAL; + afr_unlock (frame, this); return -1; } @@ -1524,6 +1525,7 @@ afr_nonblocking_inodelk (call_frame_t *frame, xlator_t *this) local->op_errno = EINVAL; int_lock->lock_op_errno = EINVAL; + afr_unlock (frame, this); ret = -1; goto out; } |