[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>
This commit is contained in:
Родитель
ebdec83ba4
Коммит
215c7f9fa1
|
@ -917,8 +917,9 @@ static int o2hb_thread(void *data)
|
||||||
elapsed_msec = o2hb_elapsed_msecs(&before_hb, &after_hb);
|
elapsed_msec = o2hb_elapsed_msecs(&before_hb, &after_hb);
|
||||||
|
|
||||||
mlog(0, "start = %lu.%lu, end = %lu.%lu, msec = %u\n",
|
mlog(0, "start = %lu.%lu, end = %lu.%lu, msec = %u\n",
|
||||||
before_hb.tv_sec, before_hb.tv_usec,
|
before_hb.tv_sec, (unsigned long) before_hb.tv_usec,
|
||||||
after_hb.tv_sec, after_hb.tv_usec, elapsed_msec);
|
after_hb.tv_sec, (unsigned long) after_hb.tv_usec,
|
||||||
|
elapsed_msec);
|
||||||
|
|
||||||
if (elapsed_msec < reg->hr_timeout_ms) {
|
if (elapsed_msec < reg->hr_timeout_ms) {
|
||||||
/* the kthread api has blocked signals for us so no
|
/* the kthread api has blocked signals for us so no
|
||||||
|
|
|
@ -1285,14 +1285,16 @@ static void o2net_idle_timer(unsigned long data)
|
||||||
mlog(ML_NOTICE, "here are some times that might help debug the "
|
mlog(ML_NOTICE, "here are some times that might help debug the "
|
||||||
"situation: (tmr %ld.%ld now %ld.%ld dr %ld.%ld adv "
|
"situation: (tmr %ld.%ld now %ld.%ld dr %ld.%ld adv "
|
||||||
"%ld.%ld:%ld.%ld func (%08x:%u) %ld.%ld:%ld.%ld)\n",
|
"%ld.%ld:%ld.%ld func (%08x:%u) %ld.%ld:%ld.%ld)\n",
|
||||||
sc->sc_tv_timer.tv_sec, sc->sc_tv_timer.tv_usec,
|
sc->sc_tv_timer.tv_sec, (long) sc->sc_tv_timer.tv_usec,
|
||||||
now.tv_sec, now.tv_usec,
|
now.tv_sec, (long) now.tv_usec,
|
||||||
sc->sc_tv_data_ready.tv_sec, sc->sc_tv_data_ready.tv_usec,
|
sc->sc_tv_data_ready.tv_sec, (long) sc->sc_tv_data_ready.tv_usec,
|
||||||
sc->sc_tv_advance_start.tv_sec, sc->sc_tv_advance_start.tv_usec,
|
sc->sc_tv_advance_start.tv_sec,
|
||||||
sc->sc_tv_advance_stop.tv_sec, sc->sc_tv_advance_stop.tv_usec,
|
(long) sc->sc_tv_advance_start.tv_usec,
|
||||||
|
sc->sc_tv_advance_stop.tv_sec,
|
||||||
|
(long) sc->sc_tv_advance_stop.tv_usec,
|
||||||
sc->sc_msg_key, sc->sc_msg_type,
|
sc->sc_msg_key, sc->sc_msg_type,
|
||||||
sc->sc_tv_func_start.tv_sec, sc->sc_tv_func_start.tv_usec,
|
sc->sc_tv_func_start.tv_sec, (long) sc->sc_tv_func_start.tv_usec,
|
||||||
sc->sc_tv_func_stop.tv_sec, sc->sc_tv_func_stop.tv_usec);
|
sc->sc_tv_func_stop.tv_sec, (long) sc->sc_tv_func_stop.tv_usec);
|
||||||
|
|
||||||
o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
|
o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1022,8 +1022,9 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
|
||||||
}
|
}
|
||||||
newsize = count + saved_pos;
|
newsize = count + saved_pos;
|
||||||
|
|
||||||
mlog(0, "pos=%lld newsize=%"MLFu64" cursize=%lld\n",
|
mlog(0, "pos=%lld newsize=%lld cursize=%lld\n",
|
||||||
saved_pos, newsize, i_size_read(inode));
|
(long long) saved_pos, (long long) newsize,
|
||||||
|
(long long) i_size_read(inode));
|
||||||
|
|
||||||
/* No need for a higher level metadata lock if we're
|
/* No need for a higher level metadata lock if we're
|
||||||
* never going past i_size. */
|
* never going past i_size. */
|
||||||
|
@ -1042,8 +1043,9 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
|
||||||
spin_unlock(&OCFS2_I(inode)->ip_lock);
|
spin_unlock(&OCFS2_I(inode)->ip_lock);
|
||||||
|
|
||||||
mlog(0, "Writing at EOF, may need more allocation: "
|
mlog(0, "Writing at EOF, may need more allocation: "
|
||||||
"i_size = %lld, newsize = %"MLFu64", need %u clusters\n",
|
"i_size = %lld, newsize = %lld, need %u clusters\n",
|
||||||
i_size_read(inode), newsize, clusters);
|
(long long) i_size_read(inode), (long long) newsize,
|
||||||
|
clusters);
|
||||||
|
|
||||||
/* We only want to continue the rest of this loop if
|
/* We only want to continue the rest of this loop if
|
||||||
* our extend will actually require more
|
* our extend will actually require more
|
||||||
|
|
Загрузка…
Ссылка в новой задаче