From 02518836297c9428f79bda1c2dfc6dde7c008069 Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Mon, 24 May 2010 14:15:08 +0000 Subject: features/locks: Use fuse supplied lock owner even for internal locks. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Anand V. Avati BUG: 934 (md5sum mismatch when files are transferred using vsftpd) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=934 --- xlators/features/locks/src/entrylk.c | 2 +- xlators/features/locks/src/inodelk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xlators') diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index b83044b7f..9109740f3 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -325,7 +325,7 @@ __lock_name (pl_inode_t *pinode, const char *basename, entrylk_type type, trans = frame->root->trans; client_pid = frame->root->pid; - owner = (uint64_t)(long)frame->root; + owner = frame->root->lk_owner; lock = new_entrylk_lock (pinode, basename, type, trans, client_pid, owner, dom->domain); if (!lock) { diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index 50a5996d7..0017e3ed2 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -569,7 +569,7 @@ pl_common_inodelk (call_frame_t *frame, xlator_t *this, transport = frame->root->trans; client_pid = frame->root->pid; - owner = (uint64_t) (long)frame->root; + owner = frame->root->lk_owner; pinode = pl_inode_get (this, inode); if (!pinode) { -- cgit