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

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext4-mmp-rhel6.patch

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
index e2942a9..17e0914 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
@@ -51,9 +51,9 @@ Index: linux-stage/fs/ext4/ext4.h
 +
 +      /* Kernel thread for multiple mount protection */
 +      struct task_struct *s_mmp_tsk;
- };
  
- static inline struct ext4_sb_info *EXT4_SB(struct super_block *sb)
+       /* Lazy inode table initialization info */
+       struct ext4_li_request *s_li_request;
 @@ -1176,7 +1179,8 @@ static inline void ext4_clear_inode_stat
                                         EXT4_FEATURE_INCOMPAT_META_BG| \
                                         EXT4_FEATURE_INCOMPAT_EXTENTS| \
@@ -268,7 +268,7 @@ Index: linux-stage/fs/ext4/mmp.c
 +       mmp->mmp_check_interval = cpu_to_le16(mmp_check_interval);
 +       bdevname(bh->b_bdev, mmp->mmp_bdevname);
 +
-+       memcpy(mmp->mmp_nodename, init_utsname()->sysname,
++       memcpy(mmp->mmp_nodename, init_utsname()->nodename,
 +              sizeof(mmp->mmp_nodename));
 +
 +       while (!kthread_should_stop()) {
@@ -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.
 +                */
-+               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++;
 +               }
 +