summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2010-04-27 07:41:54 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-04-27 06:32:03 -0700
commitb8f058432a09f6e217506be7bc4576e65186107a (patch)
tree28387aa97586af0aca69be667b0b0b291f427eb3
parent608e73fb963a9ae3ca9a81d95f18af7b6749c846 (diff)
cluster/afr: Send the struct flock returned by the server to the user only in the UNWIND path.v2.0.10rc3
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 521 (SPECFS validation fails over distribute + replicate) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=521
-rw-r--r--xlators/cluster/afr/src/afr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c
index 584a3f8..028be50 100644
--- a/xlators/cluster/afr/src/afr.c
+++ b/xlators/cluster/afr/src/afr.c
@@ -2065,7 +2065,7 @@ afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
priv->children[child_index],
priv->children[child_index]->fops->lk,
local->fd, local->cont.lk.cmd,
- lock);
+ &local->cont.lk.flock);
} else if (local->op_ret == -1) {
/* all nodes have gone down */
@@ -2074,7 +2074,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,
- &local->cont.lk.flock);
+ lock);
}
return 0;