3.4-stable patches

added patches:
	ext4-clarify-error-count-warning-messages.patch

diff --git a/queue-3.4/ext4-clarify-error-count-warning-messages.patch b/queue-3.4/ext4-clarify-error-count-warning-messages.patch
new file mode 100644 (file)
index 0000000..9b31afe
--- /dev/null
+++ b/queue-3.4/ext4-clarify-error-count-warning-messages.patch
@@ -0,0 +1,46 @@
+From ae0f78de2c43b6fadd007c231a352b13b5be8ed2 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Sat, 5 Jul 2014 18:40:52 -0400
+Subject: ext4: clarify error count warning messages
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+commit ae0f78de2c43b6fadd007c231a352b13b5be8ed2 upstream.
+
+Make it clear that values printed are times, and that it is error
+since last fsck. Also add note about fsck version required.
+
+Signed-off-by: Pavel Machek <pavel@ucw.cz>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Reviewed-by: Andreas Dilger <adilger@dilger.ca>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/ext4/super.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -2589,10 +2589,11 @@ static void print_daily_error_info(unsig
+       es = sbi->s_es;
+ 
+       if (es->s_error_count)
+-              ext4_msg(sb, KERN_NOTICE, "error count: %u",
++              /* fsck newer than v1.41.13 is needed to clean this condition. */
++              ext4_msg(sb, KERN_NOTICE, "error count since last fsck: %u",
+                        le32_to_cpu(es->s_error_count));
+       if (es->s_first_error_time) {
+-              printk(KERN_NOTICE "EXT4-fs (%s): initial error at %u: %.*s:%d",
++              printk(KERN_NOTICE "EXT4-fs (%s): initial error at time %u: %.*s:%d",
+                      sb->s_id, le32_to_cpu(es->s_first_error_time),
+                      (int) sizeof(es->s_first_error_func),
+                      es->s_first_error_func,
+@@ -2606,7 +2607,7 @@ static void print_daily_error_info(unsig
+               printk("\n");
+       }
+       if (es->s_last_error_time) {
+-              printk(KERN_NOTICE "EXT4-fs (%s): last error at %u: %.*s:%d",
++              printk(KERN_NOTICE "EXT4-fs (%s): last error at time %u: %.*s:%d",
+                      sb->s_id, le32_to_cpu(es->s_last_error_time),
+                      (int) sizeof(es->s_last_error_func),
+                      es->s_last_error_func,

diff --git a/queue-3.4/series b/queue-3.4/series
index 12e5c3f453b31b348c1107f7516c7f43a8996914..8e0122721c41ec1a3cff77888d3e38110de438c6 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -5,3 +5,4 @@ cpuset-mempolicy-fix-sleeping-function-called-from-invalid-context.patch
 hwmon-amc6821-fix-permissions-for-temp2_input.patch
 hwmon-adm1029-ensure-the-fan_div-cache-is-updated-in-set_fan_div.patch
 powerpc-perf-never-program-book3s-pmcs-with-values-0x80000000.patch
+ext4-clarify-error-count-warning-messages.patch