Added missing Xen Kernel Patches which were not commited because

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / reiserfs-consistent-messages.diff

diff --git a/src/patches/suse-2.6.27.31/patches.suse/reiserfs-consistent-messages.diff b/src/patches/suse-2.6.27.31/patches.suse/reiserfs-consistent-messages.diff
new file mode 100644 (file)
index 0000000..11bcbfe
--- /dev/null
+++ b/src/patches/suse-2.6.27.31/patches.suse/reiserfs-consistent-messages.diff
@@ -0,0 +1,80 @@
+From: Jeff Mahoney <jeffm@suse.com>
+Subject: reiserfs: use more consistent printk formatting
+
+ The output format between a warning/error/panic/info/etc changes with
+ which one is used.
+
+ The following patch makes the messages more internally consistent, but also
+ more consistent with other Linux filesystems.
+
+Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+
+--
+ fs/reiserfs/prints.c |   28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+--- a/fs/reiserfs/prints.c
++++ b/fs/reiserfs/prints.c
+@@ -268,10 +268,10 @@ void reiserfs_warning(struct super_block
+ {
+       do_reiserfs_warning(fmt);
+       if (sb)
+-              printk(KERN_WARNING "ReiserFS: %s: warning: %s\n",
+-                     reiserfs_bdevname(sb), error_buf);
++              printk(KERN_WARNING "REISERFS warning (device %s): %s\n",
++                     sb->s_id, error_buf);
+       else
+-              printk(KERN_WARNING "ReiserFS: warning: %s\n", error_buf);
++              printk(KERN_WARNING "REISERFS warning: %s\n", error_buf);
+ }
+ 
+ /* No newline.. reiserfs_info calls can be followed by printk's */
+@@ -279,10 +279,10 @@ void reiserfs_info(struct super_block *s
+ {
+       do_reiserfs_warning(fmt);
+       if (sb)
+-              printk(KERN_NOTICE "ReiserFS: %s: %s",
+-                     reiserfs_bdevname(sb), error_buf);
++              printk(KERN_NOTICE "REISERFS (device %s): %s",
++                     sb->s_id, error_buf);
+       else
+-              printk(KERN_NOTICE "ReiserFS: %s", error_buf);
++              printk(KERN_NOTICE "REISERFS %s:", error_buf);
+ }
+ 
+ /* No newline.. reiserfs_printk calls can be followed by printk's */
+@@ -297,10 +297,10 @@ void reiserfs_debug(struct super_block *
+ #ifdef CONFIG_REISERFS_CHECK
+       do_reiserfs_warning(fmt);
+       if (s)
+-              printk(KERN_DEBUG "ReiserFS: %s: %s\n",
+-                     reiserfs_bdevname(s), error_buf);
++              printk(KERN_DEBUG "REISERFS debug (device %s): %s\n",
++                     s->s_id, error_buf);
+       else
+-              printk(KERN_DEBUG "ReiserFS: %s\n", error_buf);
++              printk(KERN_DEBUG "REISERFS debug: %s\n", error_buf);
+ #endif
+ }
+ 
+@@ -368,15 +368,15 @@ void reiserfs_abort(struct super_block *
+       do_reiserfs_warning(fmt);
+ 
+       if (reiserfs_error_panic(sb)) {
+-              panic(KERN_CRIT "REISERFS: panic (device %s): %s\n",
+-                    reiserfs_bdevname(sb), error_buf);
++              panic(KERN_CRIT "REISERFS panic (device %s): %s\n", sb->s_id,
++                    error_buf);
+       }
+ 
+-      if (sb->s_flags & MS_RDONLY)
++      if (reiserfs_is_journal_aborted(SB_JOURNAL(sb)))
+               return;
+ 
+-      printk(KERN_CRIT "REISERFS: abort (device %s): %s\n",
+-             reiserfs_bdevname(sb), error_buf);
++      printk(KERN_CRIT "REISERFS abort (device %s): %s\n", sb->s_id,
++             error_buf);
+ 
+       sb->s_flags |= MS_RDONLY;
+       reiserfs_journal_abort(sb, errno);