X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext3-mmp-2.6-rhel4.patch;fp=ldiskfs%2Fkernel_patches%2Fpatches%2Fext3-mmp-2.6-rhel4.patch;h=8362d565402bb9df2c1fc0ec101e4c5cac2852b3;hb=b9b8287ac064dee506041f952e1b529a53f3258e;hp=080bff0bfca21606850744298c19a0e443b822bc;hpb=5d3683014c501a724a1209b29b377a6c6c0c6e2d;p=fs%2Flustre-release.git

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch
index 080bff0..8362d56 100644
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch
@@ -347,7 +347,16 @@ Index: linux-2.6.9-67.0.22/fs/ext3/super.c
  	/*
  	 * The first inode we look at is the journal inode.  Don't try
  	 * root first: it may be modified in the journal!
-@@ -2404,6 +2721,11 @@ int ext3_remount (struct super_block * s
+@@ -1877,6 +2194,8 @@ static int ext3_fill_super (struct super
+ 	return 0;
+ 
+ failed_mount3:
++	if (sbi->s_mmp_tsk)
++		kthread_stop(sbi->s_mmp_tsk);
+ 	journal_destroy(sbi->s_journal);
+ failed_mount2:
+ 	for (i = 0; i < db_count; i++)
+@@ -2404,6 +2723,11 @@ int ext3_remount (struct super_block * s
  				return ret;
  			if (!ext3_setup_super (sb, es, 0))
  				sb->s_flags &= ~MS_RDONLY;