From b8f058432a09f6e217506be7bc4576e65186107a Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Tue, 27 Apr 2010 07:41:54 +0000 Subject: cluster/afr: Send the struct flock returned by the server to the user only in the UNWIND path. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Anand V. Avati BUG: 521 (SPECFS validation fails over distribute + replicate) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=521 --- xlators/cluster/afr/src/afr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index 584a3f83e6b..028be5064cd 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; -- cgit