From 468768d2803fa2cedafd7fc1dd379c69f45f50af Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Thu, 1 Mar 2012 11:43:57 -0800 Subject: Revert "afr: [Un]Set the 'right' lkowner for [f]{inode|entry}_lk and the 'enclosed' fop." This reverts commit bcfd365c10d20bde920a3c6cdd1f95b7da5ffe84. --- xlators/cluster/afr/src/pump.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'xlators/cluster/afr/src/pump.c') diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c index bc9579100..e795c38e0 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, -- cgit