aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/locking
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/locking')
-rw-r--r--fs/gfs2/locking/dlm/thread.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c
index 3e2edcc2dbf6..489235b2edba 100644
--- a/fs/gfs2/locking/dlm/thread.c
+++ b/fs/gfs2/locking/dlm/thread.c
@@ -54,7 +54,8 @@ static void process_complete(struct gdlm_lock *lp)
54 54
55 if (lp->lksb.sb_status == -DLM_ECANCEL) { 55 if (lp->lksb.sb_status == -DLM_ECANCEL) {
56 log_info("complete dlm cancel %x,%llx flags %lx", 56 log_info("complete dlm cancel %x,%llx flags %lx",
57 lp->lockname.ln_type, lp->lockname.ln_number, 57 lp->lockname.ln_type,
58 (unsigned long long)lp->lockname.ln_number,
58 lp->flags); 59 lp->flags);
59 60
60 lp->req = lp->cur; 61 lp->req = lp->cur;
@@ -68,7 +69,8 @@ static void process_complete(struct gdlm_lock *lp)
68 if (lp->lksb.sb_status != -DLM_EUNLOCK) { 69 if (lp->lksb.sb_status != -DLM_EUNLOCK) {
69 log_info("unlock sb_status %d %x,%llx flags %lx", 70 log_info("unlock sb_status %d %x,%llx flags %lx",
70 lp->lksb.sb_status, lp->lockname.ln_type, 71 lp->lksb.sb_status, lp->lockname.ln_type,
71 lp->lockname.ln_number, lp->flags); 72 (unsigned long long)lp->lockname.ln_number,
73 lp->flags);
72 return; 74 return;
73 } 75 }
74 76
@@ -100,7 +102,8 @@ static void process_complete(struct gdlm_lock *lp)
100 102
101 if (test_and_clear_bit(LFL_CANCEL, &lp->flags)) { 103 if (test_and_clear_bit(LFL_CANCEL, &lp->flags)) {
102 log_info("complete internal cancel %x,%llx", 104 log_info("complete internal cancel %x,%llx",
103 lp->lockname.ln_type, lp->lockname.ln_number); 105 lp->lockname.ln_type,
106 (unsigned long long)lp->lockname.ln_number);
104 lp->req = lp->cur; 107 lp->req = lp->cur;
105 acb.lc_ret |= LM_OUT_CANCELED; 108 acb.lc_ret |= LM_OUT_CANCELED;
106 goto out; 109 goto out;
@@ -123,7 +126,8 @@ static void process_complete(struct gdlm_lock *lp)
123 /* this could only happen with cancels I think */ 126 /* this could only happen with cancels I think */
124 log_info("ast sb_status %d %x,%llx flags %lx", 127 log_info("ast sb_status %d %x,%llx flags %lx",
125 lp->lksb.sb_status, lp->lockname.ln_type, 128 lp->lksb.sb_status, lp->lockname.ln_type,
126 lp->lockname.ln_number, lp->flags); 129 (unsigned long long)lp->lockname.ln_number,
130 lp->flags);
127 return; 131 return;
128 } 132 }
129 133
@@ -144,9 +148,11 @@ static void process_complete(struct gdlm_lock *lp)
144 148
145 if (test_and_clear_bit(LFL_REREQUEST, &lp->flags)) { 149 if (test_and_clear_bit(LFL_REREQUEST, &lp->flags)) {
146 gdlm_assert(lp->req == DLM_LOCK_NL, "%x,%llx", 150 gdlm_assert(lp->req == DLM_LOCK_NL, "%x,%llx",
147 lp->lockname.ln_type, lp->lockname.ln_number); 151 lp->lockname.ln_type,
152 (unsigned long long)lp->lockname.ln_number);
148 gdlm_assert(lp->prev_req > DLM_LOCK_NL, "%x,%llx", 153 gdlm_assert(lp->prev_req > DLM_LOCK_NL, "%x,%llx",
149 lp->lockname.ln_type, lp->lockname.ln_number); 154 lp->lockname.ln_type,
155 (unsigned long long)lp->lockname.ln_number);
150 156
151 lp->cur = DLM_LOCK_NL; 157 lp->cur = DLM_LOCK_NL;
152 lp->req = lp->prev_req; 158 lp->req = lp->prev_req;
@@ -183,7 +189,8 @@ static void process_complete(struct gdlm_lock *lp)
183 lp->lkf &= ~DLM_LKF_CONVDEADLK; 189 lp->lkf &= ~DLM_LKF_CONVDEADLK;
184 190
185 log_debug("rereq %x,%llx id %x %d,%d", 191 log_debug("rereq %x,%llx id %x %d,%d",
186 lp->lockname.ln_type, lp->lockname.ln_number, 192 lp->lockname.ln_type,
193 (unsigned long long)lp->lockname.ln_number,
187 lp->lksb.sb_lkid, lp->cur, lp->req); 194 lp->lksb.sb_lkid, lp->cur, lp->req);
188 195
189 set_bit(LFL_REREQUEST, &lp->flags); 196 set_bit(LFL_REREQUEST, &lp->flags);