summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr/src/pump.c
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2012-03-03 00:01:23 -0800
committerVijay Bellur <vijay@gluster.com>2012-03-03 05:01:40 -0800
commit7fec9b41d8e1befa8d58a76d98207debddd60b65 (patch)
treed0f503c0dbffc53dbf22c91d7e1c70d0c4405db0 /xlators/cluster/afr/src/pump.c
parentaaac9cf176b407f89a1e8015140916b3f9d3cddb (diff)
Revert "afr: [Un]Set the 'right' lkowner for [f]{inode|entry}_lk and the 'enclosed' fop."
This reverts commit 2e80fdbeb6abbb23ff6789c2b98c82704883af0a. Change-Id: I417fd43e4195d63e5b8b83dd3beb712887130e1e Reviewed-on: http://review.gluster.com/2860 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/cluster/afr/src/pump.c')
-rw-r--r--xlators/cluster/afr/src/pump.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c
index bc95791004b..e795c38e096 100644
--- a/xlators/cluster/afr/src/pump.c
+++ b/xlators/cluster/afr/src/pump.c
@@ -696,14 +696,15 @@ pump_task_completion (int ret, call_frame_t *sync_frame, void *data)
int
pump_start (call_frame_t *pump_frame, xlator_t *this)
{
- afr_private_t *priv = NULL;
- pump_private_t *pump_priv = NULL;
- int ret = -1;
+ afr_private_t *priv = NULL;
+ pump_private_t *pump_priv = NULL;
- priv = this->private;
+ int ret = -1;
+
+ priv = this->private;
pump_priv = priv->pump_private;
- afr_set_lk_owner (pump_frame, this, NULL);
+ afr_set_lk_owner (pump_frame, this);
pump_pid = (uint64_t) (unsigned long)pump_frame->root;
ret = synctask_new (pump_priv->env, pump_task,