releases/2.6.32.17/0042-ext4-Remove-extraneous-newlines-in-ext4_msg-calls.patch

   1 From 2db9e1a9cc528228b60ece755187b60331db966d Mon Sep 17 00:00:00 2001
   2 From: Curt Wohlgemuth <curtw@google.com>
   3 Date: Sun, 30 May 2010 22:49:56 -0400
   4 Subject: ext4: Remove extraneous newlines in ext4_msg() calls
   5
   6 commit fbe845ddf368f77f86aa7500f8fd2690f54c66a8 upstream (as of v2.6.34-git13)
   7
   8 Addresses-Google-Bug: #2562325
   9
  10 Signed-off-by: Curt Wohlgemuth <curtw@google.com>
  11 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  12 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  13 ---
  14  fs/ext4/inode.c |    6 +++---
  15  fs/ext4/super.c |    2 +-
  16  2 files changed, 4 insertions(+), 4 deletions(-)
  17
  18 --- a/fs/ext4/inode.c
  19 +++ b/fs/ext4/inode.c
  20 @@ -2294,7 +2294,7 @@ static int mpage_da_map_blocks(struct mp
  21                 ext4_msg(mpd->inode->i_sb, KERN_CRIT,
  22                          "delayed block allocation failed for inode %lu at "
  23                          "logical offset %llu with max blocks %zd with "
  24 -                        "error %d\n", mpd->inode->i_ino,
  25 +                        "error %d", mpd->inode->i_ino,
  26                          (unsigned long long) next,
  27                          mpd->b_size >> mpd->inode->i_blkbits, err);
  28                 printk(KERN_CRIT "This should not happen!!  "
  29 @@ -2956,7 +2956,7 @@ retry:
  30                 if (IS_ERR(handle)) {
  31                         ret = PTR_ERR(handle);
  32                         ext4_msg(inode->i_sb, KERN_CRIT, "%s: jbd2_start: "
  33 -                              "%ld pages, ino %lu; err %d\n", __func__,
  34 +                              "%ld pages, ino %lu; err %d", __func__,
  35                                 wbc->nr_to_write, inode->i_ino, ret);
  36                         goto out_writepages;
  37                 }
  38 @@ -3031,7 +3031,7 @@ retry:
  39         if (pages_skipped != wbc->pages_skipped)
  40                 ext4_msg(inode->i_sb, KERN_CRIT,
  41                          "This should not happen leaving %s "
  42 -                        "with nr_to_write = %ld ret = %d\n",
  43 +                        "with nr_to_write = %ld ret = %d",
  44                          __func__, wbc->nr_to_write, ret);
  45
  46         /* Update index */
  47 --- a/fs/ext4/super.c
  48 +++ b/fs/ext4/super.c
  49 @@ -2902,7 +2902,7 @@ no_journal:
  50         err = ext4_setup_system_zone(sb);
  51         if (err) {
  52                 ext4_msg(sb, KERN_ERR, "failed to initialize system "
  53 -                        "zone (%d)\n", err);
  54 +                        "zone (%d)", err);
  55                 goto failed_mount4;
  56         }
  57