summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2010-05-24 14:15:08 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-05-26 00:40:57 -0700
commit02518836297c9428f79bda1c2dfc6dde7c008069 (patch)
tree52fdae6eaad53d1ccb3fbae37dd1f33e380eb69b /xlators
parentf1ba7bdff9ce90a7e110037ca0b5d2b32bda9acd (diff)
features/locks: Use fuse supplied lock owner even for internal locks.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 934 (md5sum mismatch when files are transferred using vsftpd) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=934
Diffstat (limited to 'xlators')
-rw-r--r--xlators/features/locks/src/entrylk.c2
-rw-r--r--xlators/features/locks/src/inodelk.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c
index b83044b..9109740 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 50a5996..0017e3e 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) {