ext4: fix wrong use of do_div (c225aa57) · Commits · 戴 / test

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! Fix it by using div_u64 instead. Signed-off-by:

Simon Holm Thøgersen <odie@cs.aau.dk> Signed-off-by:

"Theodore Ts'o" <tytso@mit.edu>

fs/jbd2/journal.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -37,10 +37,10 @@
		#include <linux/proc_fs.h>
		#include <linux/debugfs.h>
		#include <linux/seq_file.h>
		#include <linux/math64.h>

		#include <asm/uaccess.h>
		#include <asm/page.h>
		#include <asm/div64.h>

		EXPORT_SYMBOL(jbd2_journal_start);
		EXPORT_SYMBOL(jbd2_journal_restart);
		@@ -846,8 +846,8 @@ 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));
		seq_printf(seq, " %lluus average transaction commit time\n",
		div_u64(s->journal->j_average_commit_time, 1000));
		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",

Admin message