From f02a5b19d916eb7f1e11c913842601ac2f389283 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Tue, 20 Jun 2006 13:48:31 +0100
Subject: [PATCH] --- yaml --- r: 38718 b: refs/heads/master c:
 0239c4ae8aa5cdee6dc3792effc2800d65292c04 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/fs/gfs2/locking/dlm/thread.c | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e27b0a69f8f4..6827dd0dcefb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 695165dfba5204791bc4ae8911ed8b6326ce6d91
+refs/heads/master: 0239c4ae8aa5cdee6dc3792effc2800d65292c04
diff --git a/trunk/fs/gfs2/locking/dlm/thread.c b/trunk/fs/gfs2/locking/dlm/thread.c
index 3e2edcc2dbf6..489235b2edba 100644
--- a/trunk/fs/gfs2/locking/dlm/thread.c
+++ b/trunk/fs/gfs2/locking/dlm/thread.c
@@ -54,7 +54,8 @@ static void process_complete(struct gdlm_lock *lp)
 
 	if (lp->lksb.sb_status == -DLM_ECANCEL) {
 		log_info("complete dlm cancel %x,%llx flags %lx",
-		 	 lp->lockname.ln_type, lp->lockname.ln_number,
+		 	 lp->lockname.ln_type, 
+			 (unsigned long long)lp->lockname.ln_number,
 			 lp->flags);
 
 		lp->req = lp->cur;
@@ -68,7 +69,8 @@ static void process_complete(struct gdlm_lock *lp)
 		if (lp->lksb.sb_status != -DLM_EUNLOCK) {
 			log_info("unlock sb_status %d %x,%llx flags %lx",
 				 lp->lksb.sb_status, lp->lockname.ln_type,
-				 lp->lockname.ln_number, lp->flags);
+				 (unsigned long long)lp->lockname.ln_number,
+				 lp->flags);
 			return;
 		}
 
@@ -100,7 +102,8 @@ static void process_complete(struct gdlm_lock *lp)
 
 	if (test_and_clear_bit(LFL_CANCEL, &lp->flags)) {
 		log_info("complete internal cancel %x,%llx",
-		 	 lp->lockname.ln_type, lp->lockname.ln_number);
+		 	 lp->lockname.ln_type, 
+			 (unsigned long long)lp->lockname.ln_number);
 		lp->req = lp->cur;
 		acb.lc_ret |= LM_OUT_CANCELED;
 		goto out;
@@ -123,7 +126,8 @@ static void process_complete(struct gdlm_lock *lp)
 		/* this could only happen with cancels I think */
 		log_info("ast sb_status %d %x,%llx flags %lx",
 			 lp->lksb.sb_status, lp->lockname.ln_type,
-			 lp->lockname.ln_number, lp->flags);
+			 (unsigned long long)lp->lockname.ln_number,
+			 lp->flags);
 		return;
 	}
 
@@ -144,9 +148,11 @@ static void process_complete(struct gdlm_lock *lp)
 
 	if (test_and_clear_bit(LFL_REREQUEST, &lp->flags)) {
 		gdlm_assert(lp->req == DLM_LOCK_NL, "%x,%llx",
-			    lp->lockname.ln_type, lp->lockname.ln_number);
+			    lp->lockname.ln_type,
+			    (unsigned long long)lp->lockname.ln_number);
 		gdlm_assert(lp->prev_req > DLM_LOCK_NL, "%x,%llx",
-			    lp->lockname.ln_type, lp->lockname.ln_number);
+			    lp->lockname.ln_type,
+			    (unsigned long long)lp->lockname.ln_number);
 
 		lp->cur = DLM_LOCK_NL;
 		lp->req = lp->prev_req;
@@ -183,7 +189,8 @@ static void process_complete(struct gdlm_lock *lp)
 		lp->lkf &= ~DLM_LKF_CONVDEADLK;
 
 		log_debug("rereq %x,%llx id %x %d,%d",
-			  lp->lockname.ln_type, lp->lockname.ln_number,
+			  lp->lockname.ln_type,
+			  (unsigned long long)lp->lockname.ln_number,
 			  lp->lksb.sb_lkid, lp->cur, lp->req);
 
 		set_bit(LFL_REREQUEST, &lp->flags);