diff options
author | Ryusuke Konishi <ryusuke@osrg.net> | 2006-11-29 09:33:48 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-11-30 10:37:22 -0500 |
commit | 57adf7eede38d315e0e328c52484d6a596e9a238 (patch) | |
tree | 6e08a97b0de41ecc46e465d01f100bb32eeffecc /fs/dlm | |
parent | 0ac230699a0f3f0d15ad4e4ad99446dac5b4a21f (diff) |
[DLM] fix format warnings in rcom.c and recoverd.c
This fixes the following gcc warnings generated on
the architectures where uint64_t != unsigned long long (e.g. ppc64).
fs/dlm/rcom.c:154: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'uint64_t'
fs/dlm/rcom.c:154: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'uint64_t'
fs/dlm/recoverd.c:48: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'uint64_t'
fs/dlm/recoverd.c:202: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'uint64_t'
fs/dlm/recoverd.c:210: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'uint64_t'
Signed-off-by: Ryusuke Konishi <ryusuke@osrg.net>
Signed-off-by: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/dlm')
-rw-r--r-- | fs/dlm/rcom.c | 3 | ||||
-rw-r--r-- | fs/dlm/recoverd.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c index c42f2db6c4b4..4cc31be9cd9d 100644 --- a/fs/dlm/rcom.c +++ b/fs/dlm/rcom.c | |||
@@ -172,7 +172,8 @@ static void receive_sync_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in) | |||
172 | rc_in->rc_id != ls->ls_rcom_seq) { | 172 | rc_in->rc_id != ls->ls_rcom_seq) { |
173 | log_debug(ls, "reject reply %d from %d seq %llx expect %llx", | 173 | log_debug(ls, "reject reply %d from %d seq %llx expect %llx", |
174 | rc_in->rc_type, rc_in->rc_header.h_nodeid, | 174 | rc_in->rc_type, rc_in->rc_header.h_nodeid, |
175 | rc_in->rc_id, ls->ls_rcom_seq); | 175 | (unsigned long long)rc_in->rc_id, |
176 | (unsigned long long)ls->ls_rcom_seq); | ||
176 | goto out; | 177 | goto out; |
177 | } | 178 | } |
178 | memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length); | 179 | memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length); |
diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c index 9dc2f9156f15..650536aa5139 100644 --- a/fs/dlm/recoverd.c +++ b/fs/dlm/recoverd.c | |||
@@ -45,7 +45,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
45 | unsigned long start; | 45 | unsigned long start; |
46 | int error, neg = 0; | 46 | int error, neg = 0; |
47 | 47 | ||
48 | log_debug(ls, "recover %llx", rv->seq); | 48 | log_debug(ls, "recover %llx", (unsigned long long)rv->seq); |
49 | 49 | ||
50 | mutex_lock(&ls->ls_recoverd_active); | 50 | mutex_lock(&ls->ls_recoverd_active); |
51 | 51 | ||
@@ -212,7 +212,8 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
212 | 212 | ||
213 | dlm_astd_wake(); | 213 | dlm_astd_wake(); |
214 | 214 | ||
215 | log_debug(ls, "recover %llx done: %u ms", rv->seq, | 215 | log_debug(ls, "recover %llx done: %u ms", |
216 | (unsigned long long)rv->seq, | ||
216 | jiffies_to_msecs(jiffies - start)); | 217 | jiffies_to_msecs(jiffies - start)); |
217 | mutex_unlock(&ls->ls_recoverd_active); | 218 | mutex_unlock(&ls->ls_recoverd_active); |
218 | 219 | ||
@@ -220,7 +221,8 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
220 | 221 | ||
221 | fail: | 222 | fail: |
222 | dlm_release_root_list(ls); | 223 | dlm_release_root_list(ls); |
223 | log_debug(ls, "recover %llx error %d", rv->seq, error); | 224 | log_debug(ls, "recover %llx error %d", |
225 | (unsigned long long)rv->seq, error); | ||
224 | mutex_unlock(&ls->ls_recoverd_active); | 226 | mutex_unlock(&ls->ls_recoverd_active); |
225 | return error; | 227 | return error; |
226 | } | 228 | } |