summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2010-05-24 14:16:17 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-05-26 00:40:53 -0700
commit4d195fb92fed43ab7ca9d1568432913e4dbeef0e (patch)
treed766632d337b32c6a4ec7eb2aaf633878709fe38 /xlators
parent5e849ce81a060a543201c431c5ba00e413cfdfff (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 f7961be95..603e73da0 100644
--- a/xlators/features/locks/src/entrylk.c
+++ b/xlators/features/locks/src/entrylk.c
@@ -326,7 +326,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 f8afe6ab5..592d14e08 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -570,7 +570,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) {