summaryrefslogtreecommitdiffstats
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:51:37 -0700
commitbb4955c4e12618171ae69c4161db709ff7d29981 (patch)
tree533d4a44c528301e77a073a4ae558f620cd423b3
parent3917c5a3d14853e1d4642d3ccd913c9a7de27173 (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
-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 41eff8ed036..a3f1e9acea0 100644
--- a/xlators/cluster/afr/src/afr.c
+++ b/xlators/cluster/afr/src/afr.c
@@ -2445,6 +2445,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++;
@@ -2463,7 +2464,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;