korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

[GFS2] Fix printk format warnings in DLM code

Browse Source 
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>
This commit is contained in:
David Woodhouse 2006-06-20 13:48:31 +01:00
parent 695165dfba
commit 0239c4ae8a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/gfs2/locking/dlm/thread.c
View File

@ -54,7 +54,8 @@ static void process_complete(struct gdlm_lock *lp)
if (lp->lksb.sb_status == -DLM_ECANCEL) { if (lp->lksb.sb_status == -DLM_ECANCEL) {
log_info("complete dlm cancel %x,%llx flags %lx", 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->flags);
lp->req = lp->cur; lp->req = lp->cur;
@ -68,7 +69,8 @@ static void process_complete(struct gdlm_lock *lp)
if (lp->lksb.sb_status != -DLM_EUNLOCK) { if (lp->lksb.sb_status != -DLM_EUNLOCK) {
log_info("unlock sb_status %d %x,%llx flags %lx", log_info("unlock sb_status %d %x,%llx flags %lx",
lp->lksb.sb_status, lp->lockname.ln_type, lp->lksb.sb_status, lp->lockname.ln_type,
lp->lockname.ln_number, lp->flags); (unsigned long long)lp->lockname.ln_number,
lp->flags);
return; return;
} }
@ -100,7 +102,8 @@ static void process_complete(struct gdlm_lock *lp)
if (test_and_clear_bit(LFL_CANCEL, &lp->flags)) { if (test_and_clear_bit(LFL_CANCEL, &lp->flags)) {
log_info("complete internal cancel %x,%llx", 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; lp->req = lp->cur;
acb.lc_ret |= LM_OUT_CANCELED; acb.lc_ret |= LM_OUT_CANCELED;
goto out; goto out;
@ -123,7 +126,8 @@ static void process_complete(struct gdlm_lock *lp)
/* this could only happen with cancels I think */ /* this could only happen with cancels I think */
log_info("ast sb_status %d %x,%llx flags %lx", log_info("ast sb_status %d %x,%llx flags %lx",
lp->lksb.sb_status, lp->lockname.ln_type, lp->lksb.sb_status, lp->lockname.ln_type,
lp->lockname.ln_number, lp->flags); (unsigned long long)lp->lockname.ln_number,
lp->flags);
return; return;
} }
@ -144,9 +148,11 @@ static void process_complete(struct gdlm_lock *lp)
if (test_and_clear_bit(LFL_REREQUEST, &lp->flags)) { if (test_and_clear_bit(LFL_REREQUEST, &lp->flags)) {
gdlm_assert(lp->req == DLM_LOCK_NL, "%x,%llx", 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", 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->cur = DLM_LOCK_NL;
lp->req = lp->prev_req; lp->req = lp->prev_req;
@ -183,7 +189,8 @@ static void process_complete(struct gdlm_lock *lp)
lp->lkf &= ~DLM_LKF_CONVDEADLK; lp->lkf &= ~DLM_LKF_CONVDEADLK;
log_debug("rereq %x,%llx id %x %d,%d", 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); lp->lksb.sb_lkid, lp->cur, lp->req);
set_bit(LFL_REREQUEST, &lp->flags); set_bit(LFL_REREQUEST, &lp->flags);