X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext4-mmp-rhel5.patch;h=812d9a92acb54da3032f2077a6fb433e813ff4dc;hp=d01d04608ce6ca95528712321bf1b20feed840a2;hb=8007b51d6d9caa2a0ee9d5649ea9b869603f8cfa;hpb=057784c2107a803436369727c25f7289650f0b9a

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
index d01d046..812d9a9 100644
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
@@ -370,18 +370,18 @@ Index: linux-2.6.18-128.1.6/fs/ext4/super.c
  	 * The first inode we look at is the journal inode.  Don't try
  	 * root first: it may be modified in the journal!
 @@ -2445,6 +2775,8 @@ failed_mount3:
- 	percpu_counter_destroy(&sbi->s_freeblocks_counter);
  	percpu_counter_destroy(&sbi->s_freeinodes_counter);
  	percpu_counter_destroy(&sbi->s_dirs_counter);
+	percpu_counter_destroy(&sbi->s_dirtyblocks_counter);
 +	if (sbi->s_mmp_tsk)
 +		kthread_stop(sbi->s_mmp_tsk);
  failed_mount2:
  	for (i = 0; i < db_count; i++)
  		brelse(sbi->s_group_desc[i]);
 @@ -2918,7 +3250,7 @@ static int ext4_remount(struct super_blo
- 	unsigned long old_sb_flags;
  	struct ext4_mount_options old_opts;
  	ext4_group_t g;
+	unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO;
 -	int err;
 +	int err = 0;
  #ifdef CONFIG_QUOTA