summaryrefslogtreecommitdiffstats
path: root/xlators/features/locks/src/entrylk.c
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2009-12-03 14:51:10 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-12-03 12:45:11 -0800
commit120b446967ef33701a31d0da23324177922a3d73 (patch)
tree1331a92ed1dd0692dbec80f73ac40481da98dca5 /xlators/features/locks/src/entrylk.c
parent83487d024bcfe671ef83752c8c3a8b56b8dcee2b (diff)
features/locks: Changes in log messages reflecting lk-owner.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 336 (Use lock owner field from fuse in locks) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=336
Diffstat (limited to 'xlators/features/locks/src/entrylk.c')
-rw-r--r--xlators/features/locks/src/entrylk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c
index 6fc45bccede..b83044b7f28 100644
--- a/xlators/features/locks/src/entrylk.c
+++ b/xlators/features/locks/src/entrylk.c
@@ -188,7 +188,7 @@ pl_print_entrylk (char *str, int size, entrylk_cmd cmd, entrylk_type type,
break;
}
- snprintf (str, size, "cmd=%s, type=%s, basename=%s, domain: %s",
+ snprintf (str, size, "lock=ENTRYLK, cmd=%s, type=%s, basename=%s, domain: %s",
cmd_str, type_str, basename, domain);
}
@@ -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)frame->root;
+ owner = (uint64_t)(long)frame->root;
lock = new_entrylk_lock (pinode, basename, type, trans, client_pid, owner, dom->domain);
if (!lock) {
@@ -618,7 +618,7 @@ pl_common_entrylk (call_frame_t *frame, xlator_t *this,
entrylk_trace_in (this, frame, volume, fd, loc, basename, cmd, type);
pid = frame->root->pid;
- owner = (uint64_t) frame->root;
+ owner = (uint64_t)(long) frame->root;
transport = frame->root->trans;
if (pid == 0) {