diff options
| author | Pavan Sondur <pavan@gluster.com> | 2010-08-31 10:25:51 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-08-31 11:55:46 -0700 |
| commit | 25dc93419e882ba733841a18e8addc1c7a6a01ab (patch) | |
| tree | e9e8243f7fa2ac6282538c1e7f4d86c061a2da4f /xlators/cluster/afr/src/afr-lk-common.c | |
| parent | 70652df2f7780aa734119941ac54d88ae6de7ae9 (diff) | |
cluster/afr: Break STACK_WIND loop when the call count is reached.
Fix also has a check for self heal relevant to pump.
Tested with dbench with AFR client and pump on server.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1443 (Crash in afr_nonblocking_entrylk_cbk)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1443
Diffstat (limited to 'xlators/cluster/afr/src/afr-lk-common.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-lk-common.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c index dc850d38f..a7cd60f30 100644 --- a/xlators/cluster/afr/src/afr-lk-common.c +++ b/xlators/cluster/afr/src/afr-lk-common.c @@ -628,6 +628,9 @@ afr_unlock_inodelk (call_frame_t *frame, xlator_t *this) } } + + if (!--call_count) + break; } out: @@ -691,6 +694,9 @@ afr_unlock_entrylk (call_frame_t *frame, xlator_t *this) loc, basename, ENTRYLK_UNLOCK, ENTRYLK_WRLCK); } + + if (!--call_count) + break; } out: @@ -1262,6 +1268,9 @@ afr_nonblocking_entrylk (call_frame_t *frame, xlator_t *this) this->name, loc, basename, ENTRYLK_LOCK, ENTRYLK_WRLCK); } + + if (!--call_count) + break; } } @@ -1397,6 +1406,10 @@ afr_nonblocking_inodelk (call_frame_t *frame, xlator_t *this) F_SETLK, &flock); } + + if (!--call_count) + break; + } } else { call_count = internal_lock_count (frame, this, NULL); @@ -1414,6 +1427,9 @@ afr_nonblocking_inodelk (call_frame_t *frame, xlator_t *this) this->name, &local->loc, F_SETLK, &flock); } + + if (!--call_count) + break; } } @@ -1511,6 +1527,8 @@ afr_unlock_lower_entrylk (call_frame_t *frame, xlator_t *this) ENTRYLK_UNLOCK, ENTRYLK_WRLCK); } + if (!--call_count) + break; } out: |