Commit 215c7f9fa11d3fc6ccd2df242d259c721ec7ae6a
1 parent
ebdec83ba4
Exists in
master
and in
20 other branches
[PATCH] ocfs2: fix compile warnings
Fix a couple of compile warnings found when compiling on a ppc64 build box. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Showing 3 changed files with 18 additions and 13 deletions Side-by-side Diff
fs/ocfs2/cluster/heartbeat.c
| ... | ... | @@ -917,8 +917,9 @@ |
| 917 | 917 | elapsed_msec = o2hb_elapsed_msecs(&before_hb, &after_hb); |
| 918 | 918 | |
| 919 | 919 | mlog(0, "start = %lu.%lu, end = %lu.%lu, msec = %u\n", |
| 920 | - before_hb.tv_sec, before_hb.tv_usec, | |
| 921 | - after_hb.tv_sec, after_hb.tv_usec, elapsed_msec); | |
| 920 | + before_hb.tv_sec, (unsigned long) before_hb.tv_usec, | |
| 921 | + after_hb.tv_sec, (unsigned long) after_hb.tv_usec, | |
| 922 | + elapsed_msec); | |
| 922 | 923 | |
| 923 | 924 | if (elapsed_msec < reg->hr_timeout_ms) { |
| 924 | 925 | /* the kthread api has blocked signals for us so no |
fs/ocfs2/cluster/tcp.c
| ... | ... | @@ -1285,14 +1285,16 @@ |
| 1285 | 1285 | mlog(ML_NOTICE, "here are some times that might help debug the " |
| 1286 | 1286 | "situation: (tmr %ld.%ld now %ld.%ld dr %ld.%ld adv " |
| 1287 | 1287 | "%ld.%ld:%ld.%ld func (%08x:%u) %ld.%ld:%ld.%ld)\n", |
| 1288 | - sc->sc_tv_timer.tv_sec, sc->sc_tv_timer.tv_usec, | |
| 1289 | - now.tv_sec, now.tv_usec, | |
| 1290 | - sc->sc_tv_data_ready.tv_sec, sc->sc_tv_data_ready.tv_usec, | |
| 1291 | - sc->sc_tv_advance_start.tv_sec, sc->sc_tv_advance_start.tv_usec, | |
| 1292 | - sc->sc_tv_advance_stop.tv_sec, sc->sc_tv_advance_stop.tv_usec, | |
| 1288 | + sc->sc_tv_timer.tv_sec, (long) sc->sc_tv_timer.tv_usec, | |
| 1289 | + now.tv_sec, (long) now.tv_usec, | |
| 1290 | + sc->sc_tv_data_ready.tv_sec, (long) sc->sc_tv_data_ready.tv_usec, | |
| 1291 | + sc->sc_tv_advance_start.tv_sec, | |
| 1292 | + (long) sc->sc_tv_advance_start.tv_usec, | |
| 1293 | + sc->sc_tv_advance_stop.tv_sec, | |
| 1294 | + (long) sc->sc_tv_advance_stop.tv_usec, | |
| 1293 | 1295 | sc->sc_msg_key, sc->sc_msg_type, |
| 1294 | - sc->sc_tv_func_start.tv_sec, sc->sc_tv_func_start.tv_usec, | |
| 1295 | - sc->sc_tv_func_stop.tv_sec, sc->sc_tv_func_stop.tv_usec); | |
| 1296 | + sc->sc_tv_func_start.tv_sec, (long) sc->sc_tv_func_start.tv_usec, | |
| 1297 | + sc->sc_tv_func_stop.tv_sec, (long) sc->sc_tv_func_stop.tv_usec); | |
| 1296 | 1298 | |
| 1297 | 1299 | o2net_sc_queue_work(sc, &sc->sc_shutdown_work); |
| 1298 | 1300 | } |
fs/ocfs2/file.c
| ... | ... | @@ -1022,8 +1022,9 @@ |
| 1022 | 1022 | } |
| 1023 | 1023 | newsize = count + saved_pos; |
| 1024 | 1024 | |
| 1025 | - mlog(0, "pos=%lld newsize=%"MLFu64" cursize=%lld\n", | |
| 1026 | - saved_pos, newsize, i_size_read(inode)); | |
| 1025 | + mlog(0, "pos=%lld newsize=%lld cursize=%lld\n", | |
| 1026 | + (long long) saved_pos, (long long) newsize, | |
| 1027 | + (long long) i_size_read(inode)); | |
| 1027 | 1028 | |
| 1028 | 1029 | /* No need for a higher level metadata lock if we're |
| 1029 | 1030 | * never going past i_size. */ |
| ... | ... | @@ -1042,8 +1043,9 @@ |
| 1042 | 1043 | spin_unlock(&OCFS2_I(inode)->ip_lock); |
| 1043 | 1044 | |
| 1044 | 1045 | mlog(0, "Writing at EOF, may need more allocation: " |
| 1045 | - "i_size = %lld, newsize = %"MLFu64", need %u clusters\n", | |
| 1046 | - i_size_read(inode), newsize, clusters); | |
| 1046 | + "i_size = %lld, newsize = %lld, need %u clusters\n", | |
| 1047 | + (long long) i_size_read(inode), (long long) newsize, | |
| 1048 | + clusters); | |
| 1047 | 1049 | |
| 1048 | 1050 | /* We only want to continue the rest of this loop if |
| 1049 | 1051 | * our extend will actually require more |