Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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..0cf467a 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.16.46-0.14/fs/ext3/super.c
+Index: linux-2.6.16.60-0.31/fs/ext3/super.c
 ===================================================================
---- linux-2.6.16.46-0.14.orig/fs/ext3/super.c
-+++ linux-2.6.16.46-0.14/fs/ext3/super.c
+--- linux-2.6.16.60-0.31.orig/fs/ext3/super.c
++++ linux-2.6.16.60-0.31/fs/ext3/super.c
 @@ -36,6 +36,8 @@
  #include <linux/namei.h>
  #include <linux/quotaops.h>
@@ -11,17 +11,16 @@ Index: linux-2.6.16.46-0.14/fs/ext3/super.c
  
  #include <asm/uaccess.h>
  
-@@ -436,6 +438,9 @@ static void ext3_put_super (struct super
+@@ -436,6 +438,8 @@ static void ext3_put_super (struct super
                invalidate_bdev(sbi->journal_bdev, 0);
                ext3_blkdev_remove(sbi);
        }
 +      if (sbi->s_mmp_tsk)
 +              kthread_stop(sbi->s_mmp_tsk);
-+
-       sb->s_fs_info = NULL;
-       kfree(sbi);
-       return;
-@@ -1521,6 +1526,313 @@ static unsigned long descriptor_loc(stru
+       if (sbi->s_dev_proc) {
+               remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
+               sbi->s_dev_proc = NULL;
+@@ -1525,6 +1529,313 @@ static unsigned long descriptor_loc(stru
        return (first_data_block + has_super + (bg * sbi->s_blocks_per_group));
  }
  
@@ -335,7 +334,7 @@ Index: linux-2.6.16.46-0.14/fs/ext3/super.c
  
  static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  {
-@@ -1828,6 +2140,11 @@ static int ext3_fill_super (struct super
+@@ -1849,6 +2160,11 @@ static int ext3_fill_super (struct super
                          EXT3_HAS_INCOMPAT_FEATURE(sb,
                                    EXT3_FEATURE_INCOMPAT_RECOVER));
  
@@ -347,7 +346,7 @@ Index: linux-2.6.16.46-0.14/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!
-@@ -2438,7 +2755,7 @@ static int ext3_remount (struct super_bl
+@@ -2463,7 +2779,7 @@ static int ext3_remount (struct super_bl
        unsigned long n_blocks_count = 0;
        unsigned long old_sb_flags;
        struct ext3_mount_options old_opts;
@@ -356,7 +355,7 @@ Index: linux-2.6.16.46-0.14/fs/ext3/super.c
  #ifdef CONFIG_QUOTA
        int i;
  #endif
-@@ -2522,6 +2839,11 @@ static int ext3_remount (struct super_bl
+@@ -2547,6 +2863,11 @@ static int ext3_remount (struct super_bl
                        }
                        if (!ext3_setup_super (sb, es, 0))
                                sb->s_flags &= ~MS_RDONLY;
@@ -368,11 +367,11 @@ Index: linux-2.6.16.46-0.14/fs/ext3/super.c
                }
        }
  #ifdef CONFIG_QUOTA
-Index: linux-2.6.16.46-0.14/include/linux/ext3_fs.h
+Index: linux-2.6.16.60-0.31/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.6.16.46-0.14.orig/include/linux/ext3_fs.h
-+++ linux-2.6.16.46-0.14/include/linux/ext3_fs.h
-@@ -599,13 +599,17 @@ struct ext3_super_block {
+--- linux-2.6.16.60-0.31.orig/include/linux/ext3_fs.h
++++ linux-2.6.16.60-0.31/include/linux/ext3_fs.h
+@@ -597,13 +597,17 @@ struct ext3_super_block {
        __le32  s_first_meta_bg;        /* First metablock block group */
        __le32  s_mkfs_time;            /* When the filesystem was created */
        __le32  s_jnl_blocks[17];       /* Backup of the journal inode */
@@ -393,7 +392,7 @@ Index: linux-2.6.16.46-0.14/include/linux/ext3_fs.h
  };
  
  #ifdef __KERNEL__
-@@ -699,12 +703,14 @@ static inline int ext3_valid_inum(struct
+@@ -697,12 +701,14 @@ static inline int ext3_valid_inum(struct
  #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV     0x0008 /* Journal device */
  #define EXT3_FEATURE_INCOMPAT_META_BG         0x0010
  #define EXT3_FEATURE_INCOMPAT_EXTENTS         0x0040 /* extents support */
@@ -409,7 +408,7 @@ Index: linux-2.6.16.46-0.14/include/linux/ext3_fs.h
  #define EXT3_FEATURE_RO_COMPAT_SUPP   (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
                                         EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
-@@ -864,6 +870,39 @@ struct dir_private_info {
+@@ -862,6 +868,39 @@ struct dir_private_info {
  #define ERR_BAD_DX_DIR        -75000
  
  /*
@@ -449,11 +448,11 @@ Index: linux-2.6.16.46-0.14/include/linux/ext3_fs.h
   * Function prototypes
   */
  
-Index: linux-2.6.16.46-0.14/include/linux/ext3_fs_sb.h
+Index: linux-2.6.16.60-0.31/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.6.16.46-0.14.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.16.46-0.14/include/linux/ext3_fs_sb.h
-@@ -140,6 +140,7 @@ struct ext3_sb_info {
+--- linux-2.6.16.60-0.31.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.16.60-0.31/include/linux/ext3_fs_sb.h
+@@ -147,6 +147,7 @@ struct ext3_sb_info {
        /* locality groups */
        struct ext3_locality_group *s_locality_groups;
  
Lustre primary development and releases