Branch b1_6

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-mmp-2.6-sles10.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
index c9637f6..04635f5 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
@@ -18,10 +18,10 @@ Index: linux-2.6.16.46-0.14/fs/ext3/super.c
 +      if (sbi->s_mmp_tsk)
 +              kthread_stop(sbi->s_mmp_tsk);
 +
+       remove_proc_entry(sb->s_id, proc_root_ext3);
+       sbi->s_dev_proc = NULL;
        sb->s_fs_info = NULL;
-       kfree(sbi);
-       return;
-@@ -1521,6 +1526,313 @@ static unsigned long descriptor_loc(stru
+@@ -1529,6 +1534,313 @@ static unsigned long descriptor_loc(stru
        return (first_data_block + has_super + (bg * sbi->s_blocks_per_group));
  }