| From 6f047051d9a26c2ea0a920fb165ce4d410be898a Mon Sep 17 00:00:00 2001 |
| From: Curt Wohlgemuth <curtw@google.com> |
| Date: Sun, 16 May 2010 13:00:00 -0400 |
| Subject: [PATCH] ext4: Remove extraneous newlines in ext4_msg() calls |
| |
| commit fbe845ddf368f77f86aa7500f8fd2690f54c66a8 upstream. |
| |
| Addresses-Google-Bug: #2562325 |
| |
| Signed-off-by: Curt Wohlgemuth <curtw@google.com> |
| Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| fs/ext4/inode.c | 6 +++--- |
| fs/ext4/super.c | 2 +- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c |
| index 89a31e8..3c479ef 100644 |
| --- a/fs/ext4/inode.c |
| +++ b/fs/ext4/inode.c |
| @@ -2283,7 +2283,7 @@ static int mpage_da_map_blocks(struct mpage_da_data *mpd) |
| ext4_msg(mpd->inode->i_sb, KERN_CRIT, |
| "delayed block allocation failed for inode %lu at " |
| "logical offset %llu with max blocks %zd with " |
| - "error %d\n", mpd->inode->i_ino, |
| + "error %d", mpd->inode->i_ino, |
| (unsigned long long) next, |
| mpd->b_size >> mpd->inode->i_blkbits, err); |
| printk(KERN_CRIT "This should not happen!! " |
| @@ -2951,7 +2951,7 @@ retry: |
| if (IS_ERR(handle)) { |
| ret = PTR_ERR(handle); |
| ext4_msg(inode->i_sb, KERN_CRIT, "%s: jbd2_start: " |
| - "%ld pages, ino %lu; err %d\n", __func__, |
| + "%ld pages, ino %lu; err %d", __func__, |
| wbc->nr_to_write, inode->i_ino, ret); |
| goto out_writepages; |
| } |
| @@ -3026,7 +3026,7 @@ retry: |
| if (pages_skipped != wbc->pages_skipped) |
| ext4_msg(inode->i_sb, KERN_CRIT, |
| "This should not happen leaving %s " |
| - "with nr_to_write = %ld ret = %d\n", |
| + "with nr_to_write = %ld ret = %d", |
| __func__, wbc->nr_to_write, ret); |
| |
| /* Update index */ |
| diff --git a/fs/ext4/super.c b/fs/ext4/super.c |
| index d83cdcb..f9e57e1 100644 |
| --- a/fs/ext4/super.c |
| +++ b/fs/ext4/super.c |
| @@ -2998,7 +2998,7 @@ no_journal: |
| err = ext4_setup_system_zone(sb); |
| if (err) { |
| ext4_msg(sb, KERN_ERR, "failed to initialize system " |
| - "zone (%d)\n", err); |
| + "zone (%d)", err); |
| goto failed_mount4; |
| } |
| |
| -- |
| 1.7.0.4 |
| |
