From 892eb99b051dc79b3e5d4564b92eb7b79082c8f2 Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Mon, 1 May 2006 14:56:57 -0700
Subject: [PATCH] --- yaml --- r: 30709 b: refs/heads/master c:
 43dee336c903fae15783b90983dfdedd2c7ffefc h: refs/heads/master i:   30707:
 f2241d4a33404b99d11e2209f86087c400e42258 v: v3

---
 [refs]                          | 2 +-
 trunk/fs/ocfs2/dlm/dlmconvert.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 813d529e6a11..df7b0222f605 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a9343fa24d8d3fcb189bed2b7afcf4b8a8c1c8d
+refs/heads/master: 43dee336c903fae15783b90983dfdedd2c7ffefc
diff --git a/trunk/fs/ocfs2/dlm/dlmconvert.c b/trunk/fs/ocfs2/dlm/dlmconvert.c
index b24fa537a767..c764dc8e40a2 100644
--- a/trunk/fs/ocfs2/dlm/dlmconvert.c
+++ b/trunk/fs/ocfs2/dlm/dlmconvert.c
@@ -487,7 +487,8 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data)
 				mlog(ML_ERROR, "There is something here "
 				     "for node %u, lock->ml.cookie=%llu, "
 				     "cnv->cookie=%llu\n", cnv->node_idx,
-				     lock->ml.cookie, cnv->cookie);
+				     (unsigned long long)lock->ml.cookie,
+				     (unsigned long long)cnv->cookie);
 				break;
 			}
 		}