From bcfd365c10d20bde920a3c6cdd1f95b7da5ffe84 Mon Sep 17 00:00:00 2001 From: Krishnan Parthasarathi Date: Tue, 14 Feb 2012 21:27:10 +0530 Subject: afr: [Un]Set the 'right' lkowner for [f]{inode|entry}_lk and the 'enclosed' fop. afr 'mangles' the lkowner inorder to ensure [f]inodelk/[f]entrylk fops from the same application contend. But other fops that are 'visible' to the application should operate with the lkowner provided by fuse for correct functioning of posix-locks xlator. Change-Id: I7e71f35ae7df2a070f1f46d4fc77eed26a717673 BUG: 790743 Signed-off-by: Krishnan Parthasarathi Reviewed-on: http://review.gluster.com/2752 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/cluster/afr/src/pump.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 e795c38e096..bc95791004b 100644 --- a/xlators/cluster/afr/src/pump.c +++ b/xlators/cluster/afr/src/pump.c @@ -696,15 +696,14 @@ 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; + int ret = -1; - priv = this->private; + priv = this->private; pump_priv = priv->pump_private; - afr_set_lk_owner (pump_frame, this); + afr_set_lk_owner (pump_frame, this, NULL); pump_pid = (uint64_t) (unsigned long)pump_frame->root; ret = synctask_new (pump_priv->env, pump_task, -- cgit