diff options
| author | Vijay Bellur <vijay@gluster.com> | 2011-09-22 08:30:48 -0700 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-09-22 08:42:01 -0700 |
| commit | 9564e09e5315846a38ed18e05630ef73be5b2adb (patch) | |
| tree | ad633f8f65c61ec60a5238debe8918511e7bee2b /xlators/cluster/afr/src/afr-transaction.c | |
| parent | 7edb580b1a702096ee11ba28b66fad16fc83dbd6 (diff) | |
Revert "cluster/afr: eager locking of FD writes"v3.2.4qa3
This reverts commit 81456ec2dfb312ae60c5c4e6f960a3cbf8aaaa4c.
Change-Id: Id03335117f5137f5d09781850bf4fba6eca0f73d
Reviewed-on: http://review.gluster.com/492
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-transaction.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-transaction.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c index c0c409bbc..ac329958d 100644 --- a/xlators/cluster/afr/src/afr-transaction.c +++ b/xlators/cluster/afr/src/afr-transaction.c @@ -377,6 +377,13 @@ afr_changelog_post_op_cbk (call_frame_t *frame, void *cookie, xlator_t *this, child_index = (long) cookie; + if (op_ret == 1) { + } + + if (op_ret == 0) { + __mark_pre_op_undone_on_fd (frame, this, child_index); + } + LOCK (&frame->lock); { call_count = --local->call_count; @@ -556,7 +563,6 @@ afr_changelog_post_op (call_frame_t *frame, xlator_t *this) afr_changelog_post_op_cbk (frame, (void *)(long)i, this, 1, 0, xattr[i]); } else { - __mark_pre_op_undone_on_fd (frame, this, i); STACK_WIND_COOKIE (frame, afr_changelog_post_op_cbk, (void *) (long) i, @@ -1128,6 +1134,8 @@ afr_lock (call_frame_t *frame, xlator_t *this) { afr_pid_save (frame); + frame->root->pid = (long) frame->root; + afr_set_lk_owner (frame, this); afr_set_lock_number (frame, this); |