2009-01-05 20:12:47

by Randy Dunlap

[permalink] [raw]
Subject: [PATCH -next] jbd2: fix printk format warning

From: Randy Dunlap <[email protected]>

Fix jbd2 printk format:

fs/jbd2/journal.c:848: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'uint32_t'

Signed-off-by: Randy Dunlap <[email protected]>
---
fs/jbd2/journal.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- linux-next-20090105.orig/fs/jbd2/journal.c
+++ linux-next-20090105/fs/jbd2/journal.c
@@ -845,7 +845,8 @@ static int jbd2_seq_info_show(struct seq
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));
+ (unsigned long)do_div(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",


2009-01-11 18:52:53

by Simon Holm Thøgersen

[permalink] [raw]
Subject: Re: [PATCH -next] jbd2: fix printk format warning

man, 05 01 2009 kl. 12:11 -0800, skrev Randy Dunlap:
> From: Randy Dunlap <[email protected]>
>
> Fix jbd2 printk format:
>
> fs/jbd2/journal.c:848: warning: format '%lu' expects type 'long unsigned int',
> but argument 3 has type 'uint32_t'
>
> Signed-off-by: Randy Dunlap <[email protected]>
> ---
> fs/jbd2/journal.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> --- linux-next-20090105.orig/fs/jbd2/journal.c
> +++ linux-next-20090105/fs/jbd2/journal.c
> @@ -845,7 +845,8 @@ static int jbd2_seq_info_show(struct seq
> 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));
> + (unsigned long)do_div(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",

This patch is just as wrong as the original code. Please don't
apply it, but see my "[PATCH] jbd2: fix wrong use of do_div"
that I just sent out.


Simon Holm Thøgersen

2009-01-11 19:07:13

by Randy Dunlap

[permalink] [raw]
Subject: Re: [PATCH -next] jbd2: fix printk format warning

Simon Holm Th?gersen wrote:
> man, 05 01 2009 kl. 12:11 -0800, skrev Randy Dunlap:
>> From: Randy Dunlap <[email protected]>
>>
>> Fix jbd2 printk format:
>>
>> fs/jbd2/journal.c:848: warning: format '%lu' expects type 'long unsigned int',
>> but argument 3 has type 'uint32_t'
>>
>> Signed-off-by: Randy Dunlap <[email protected]>
>> ---
>> fs/jbd2/journal.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> --- linux-next-20090105.orig/fs/jbd2/journal.c
>> +++ linux-next-20090105/fs/jbd2/journal.c
>> @@ -845,7 +845,8 @@ static int jbd2_seq_info_show(struct seq
>> 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));
>> + (unsigned long)do_div(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",
>
> This patch is just as wrong as the original code. Please don't
> apply it, but see my "[PATCH] jbd2: fix wrong use of do_div"
> that I just sent out.

ok, where did you send it? I don't see it...

--
~Randy

2009-01-11 19:20:45

by Simon Holm Thøgersen

[permalink] [raw]
Subject: Re: [PATCH -next] jbd2: fix printk format warning

søn, 11 01 2009 kl. 11:07 -0800, skrev Randy Dunlap:
> ok, where did you send it? I don't see it...

It had a wrong recipient address so it never made it. I've sent it again
and verified that it made it this time.


Simon