[NB - removed Stephen from CC list]
On Sep 15, 2009 15:24 +0900, Toshiyuki Okajima wrote:
> +static void ext3_print_mount_message(struct super_block *sb,
> + int is_remount)
> +{
> + printk(KERN_INFO "EXT3 FS %s on %s, ",
> + is_remount? "remounted": "mounted", sb->s_id);
> + if (EXT3_SB(sb)->s_journal->j_inode == NULL) {
> + char b[BDEVNAME_SIZE];
> +
> + printk("external journal on %s\n",
> + bdevname(EXT3_SB(sb)->s_journal->j_dev, b));
> + } else {
> + printk("internal journal\n");
> + }
This won't necessarily work as you expected, because the separate
printk() calls will result in the message being printed on separate
lines of output.
Instead, this should print this all in a single line:
char jbuf[BDEVNAME_SIZE + 20] = "internal journal";
if (EXT3_SB(sb)->s_journal->j_inode == NULL) {
sprintf(jbuf, "external journal on ");
bdevname(EXT3_SB(sb)->s_journal->j_dev,
jbuf + 20));
}
printk(KERN_INFO "EXT3 FS %s on %s, %s\n",
is_remount? "remounted": "mounted", sb->s_id, jbuf)
> @@ -1296,15 +1317,6 @@ static int ext3_setup_super(struct super
> - printk(KERN_INFO "EXT3 FS on %s, ", sb->s_id);
> - if (EXT3_SB(sb)->s_journal->j_inode == NULL) {
> - char b[BDEVNAME_SIZE];
> -
> - printk("external journal on %s\n",
> - bdevname(EXT3_SB(sb)->s_journal->j_dev, b));
> - } else {
> - printk("internal journal\n");
> - }
Interesting, it was broken already... Well, best to fix it anyways.
The same should be done for the ext4 patch.
Cheers, Andreas
--
Andreas Dilger
Sr. Staff Engineer, Lustre Group
Sun Microsystems of Canada, Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
