@@ -828,6 +828,7 @@ static void *jbd2_seq_info_next(struct seq_file *seq, void *v, loff_t *pos)
static int jbd2_seq_info_show(struct seq_file *seq, void *v)
{
struct jbd2_stats_proc_session *s = seq->private;
+ u64 n;
if (v != SEQ_START_TOKEN)
return 0;
@@ -846,8 +847,11 @@ static int jbd2_seq_info_show(struct seq_file *seq, void *v)
jiffies_to_msecs(s->stats->u.run.rs_flushing / s->stats->ts_tid));
seq_printf(seq, " %ums logging transaction\n",
jiffies_to_msecs(s->stats->u.run.rs_logging / s->stats->ts_tid));
- seq_printf(seq, " %luus average transaction commit time\n",
- do_div(s->journal->j_average_commit_time, 1000));
+
+ n = s->journal->j_average_commit_time;
+ do_div(n, 1000);
+ seq_printf(seq, " %llus average transaction commit time\n", n);
+
seq_printf(seq, " %lu handles per transaction\n",
s->stats->u.run.rs_handle_count / s->stats->ts_tid);
seq_printf(seq, " %lu blocks per transaction\n",
the following warning: fs/jbd2/journal.c: In function ‘jbd2_seq_info_show’: fs/jbd2/journal.c:850: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 3 has type ‘uint32_t’ is caused by wrong usage of do_div that modifies the dividend in-place and returns the quotient. So not only would an incorrect value be displayed, but s->journal->j_average_commit_time would also be changed to a wrong value! This patch fixes it. Signed-off-by: Simon Holm Thøgersen <odie@cs.aau.dk> --- fs/jbd2/journal.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)