summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorVikas Gorur <vikas@gluster.com>2010-05-03 18:10:46 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-05-03 23:40:24 -0700
commite3ad79741be19d190a1722a27473531edd1498bf (patch)
tree245a97d381b55a328e86e1cb9da1256a7ea456c5 /xlators
parent5bb83f32833344bf5b386a6e2d74f599416b54df (diff)
cluster/afr: Unwind lk using struct flock from a successful server
Signed-off-by: Vikas Gorur <vikas@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 882 (directory traversing problem (client crash)) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=882
Diffstat (limited to 'xlators')
-rw-r--r--xlators/cluster/afr/src/afr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c
index 6c47967..da7cee3 100644
--- a/xlators/cluster/afr/src/afr.c
+++ b/xlators/cluster/afr/src/afr.c
@@ -2434,6 +2434,7 @@ afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
local->op_ret = 0;
local->op_errno = 0;
local->cont.lk.locked_nodes[child_index] = 1;
+ local->cont.lk.flock = *lock;
}
child_index++;
@@ -2452,7 +2453,7 @@ afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
/* locking has succeeded on all nodes that are up */
AFR_STACK_UNWIND (lk, frame, local->op_ret, local->op_errno,
- lock);
+ &local->cont.lk.flock);
}
return 0;