X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext4-mmp-rhel6.patch;h=17e0914f5874a00de0fe3efe1cfb04c8eec28f98;hb=9fa85c69c9e582874f52473e2612407a82319cb6;hp=9d37b39ae01ab621c906136f8fdd2c76b854ea40;hpb=b938b88935d44bd4d16ba48c7a97941676254c11;p=fs%2Flustre-release.git

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
index 9d37b39..17e0914 100644
--- 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| \
@@ -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++;
 +               }
 +