diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-06-20 13:48:31 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-20 13:48:31 +0100 |
| commit | 0239c4ae8aa5cdee6dc3792effc2800d65292c04 (patch) | |
| tree | 1e2aefd7e86e1ad39eaef25c8c7ff2d64201c119 /fs/gfs2/locking/dlm/thread.c | |
| parent | 695165dfba5204791bc4ae8911ed8b6326ce6d91 (diff) | |
[GFS2] Fix printk format warnings in DLM code
fs/gfs2/locking/dlm/thread.c: In function ‘process_complete’:
fs/gfs2/locking/dlm/thread.c:56: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 3 has type ‘uint64_t’
fs/gfs2/locking/dlm/thread.c:69: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 4 has type ‘uint64_t’
fs/gfs2/locking/dlm/thread.c:102: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 3 has type ‘uint64_t’
fs/gfs2/locking/dlm/thread.c:124: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 4 has type ‘uint64_t’
fs/gfs2/locking/dlm/thread.c:146: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 4 has type ‘uint64_t’
fs/gfs2/locking/dlm/thread.c:148: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 4 has type ‘uint64_t’
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/gfs2/locking/dlm/thread.c')
| -rw-r--r-- | fs/gfs2/locking/dlm/thread.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c index 3e2edcc2dbf..489235b2edb 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) 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); |