summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendrabhat@gluster.com>2010-05-11 03:25:10 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-05-11 10:10:02 -0700
commit031af4c3f44f1a791bfe3792dce0612e22dac707 (patch)
tree9847bba3d9f7c450adfb2ec9cf2ee7403b147f1d
parentef105a25b021bb8be5d2cbeae868da9d9288e77a (diff)
Unwind lk using struct flock from a successful server
Signed-off-by: Raghavendra Bhat <raghavendrabhat@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 028be50..2a3bc6b 100644
--- a/xlators/cluster/afr/src/afr.c
+++ b/xlators/cluster/afr/src/afr.c
@@ -2056,6 +2056,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++;
@@ -2074,7 +2075,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 (frame, local->op_ret, local->op_errno,
- lock);
+ &local->cont.lk.flock);
}
return 0;