LU-719 ldiskfs: fix error message rate-limiting logic in kmmpd

Current logic would print an error message only once, and then
'failed_writes' would stay at 1. Rework the loop to increment
'failed_writes' and print the error message every
s_mmp_update_interval * 60 seconds, as intended according to the
comment.

Signed-off-by: Nikitas Angelinas <nikitas_angelinas@xyratex.com>
Change-Id: I0c8d90927bd618542026ab5fc70cf12b85898dc3
Reviewed-by: Andrew Perepechko <andrew_perepechko@xyratex.com>
Xyratex-bug-id: MRP-222
Reviewed-on: http://review.whamcloud.com/1420
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
index 352549f..d028930 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
@@ -285,8 +285,9 @@ Index: linux-stage/fs/ext4/mmp.c
 +                * Don't spew too many error messages. Print one every
 +                * (s_mmp_update_interval * 60) seconds.
 +                */
 +                * Don't spew too many error messages. Print one every
 +                * (s_mmp_update_interval * 60) seconds.
 +                */

-+               if (retval && (failed_writes % 60) == 0) {
-+                       ext4_error(sb, "Error writing to MMP block");
++               if (retval) {
++                       if ((failed_writes % 60) == 0)
++                               ext4_error(sb, "Error writing to MMP block");

 +                       failed_writes++;
 +               }
 +
 +                       failed_writes++;
 +               }
 +

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
index 7ca04e2..17e0914 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
@@ -284,8 +284,9 @@ Index: linux-stage/fs/ext4/mmp.c
 +                * Don't spew too many error messages. Print one every
 +                * (s_mmp_update_interval * 60) seconds.
 +                */
 +                * Don't spew too many error messages. Print one every
 +                * (s_mmp_update_interval * 60) seconds.
 +                */

-+               if (retval && (failed_writes % 60) == 0) {
-+                       ext4_error(sb, "Error writing to MMP block");
++               if (retval) {
++                       if ((failed_writes % 60) == 0)
++                               ext4_error(sb, "Error writing to MMP block");

 +                       failed_writes++;
 +               }
 +
 +                       failed_writes++;
 +               }
 +