Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6ad1aa2)
Branch b1_8_gate
authorjohann <johann>
Fri, 5 Dec 2008 15:13:41 +0000 (15:13 +0000)
committerjohann <johann>
Fri, 5 Dec 2008 15:13:41 +0000 (15:13 +0000)
b=17490
i=bzzz
i=kalpak

correctly handle device paths using a subdirectory in /dev when
creating the per-device procfs directory under /proc/fs/ldiskfs.

ldiskfs/kernel_patches/patches/ext3-max-dir-size.patch patch | blob | history
ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch patch | blob | history
ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch patch | blob | history
ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch patch | blob | history
ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch patch | blob | history

diff --git a/ldiskfs/kernel_patches/patches/ext3-max-dir-size.patch b/ldiskfs/kernel_patches/patches/ext3-max-dir-size.patch
index 23457ce..97f69cc 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-max-dir-size.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-max-dir-size.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.16.60-0.27/fs/ext3/ialloc.c
+Index: linux-2.6.18-92.1.17/fs/ext3/ialloc.c
 ===================================================================
---- linux-2.6.16.60-0.27.orig/fs/ext3/ialloc.c
-+++ linux-2.6.16.60-0.27/fs/ext3/ialloc.c
-@@ -519,12 +519,15 @@ struct inode *ext3_new_inode(handle_t *h
+--- linux-2.6.18-92.1.17.orig/fs/ext3/ialloc.c
++++ linux-2.6.18-92.1.17/fs/ext3/ialloc.c
+@@ -521,12 +521,15 @@ struct inode *ext3_new_inode(handle_t *h
                return ERR_PTR(-EPERM);
  
        sb = dir->i_sb;
@@ -19,11 +19,11 @@ Index: linux-2.6.16.60-0.27/fs/ext3/ialloc.c
        es = sbi->s_es;
        if (goal) {
                group = (goal - 1) / EXT3_INODES_PER_GROUP(sb);
-Index: linux-2.6.16.60-0.27/fs/ext3/super.c
+Index: linux-2.6.18-92.1.17/fs/ext3/super.c
 ===================================================================
---- linux-2.6.16.60-0.27.orig/fs/ext3/super.c
-+++ linux-2.6.16.60-0.27/fs/ext3/super.c
-@@ -46,6 +46,12 @@
+--- linux-2.6.18-92.1.17.orig/fs/ext3/super.c
++++ linux-2.6.18-92.1.17/fs/ext3/super.c
+@@ -45,6 +45,12 @@
  #include "namei.h"
  #include "group.h"
  
@@ -36,15 +36,15 @@ Index: linux-2.6.16.60-0.27/fs/ext3/super.c
  static int ext3_load_journal(struct super_block *, struct ext3_super_block *,
                             unsigned long journal_devnum);
  static int ext3_create_journal(struct super_block *, struct ext3_super_block *,
-@@ -441,6 +447,7 @@ static void ext3_put_super (struct super
+@@ -439,6 +445,7 @@ static void ext3_put_super (struct super
+       }
        if (sbi->s_mmp_tsk)
                kthread_stop(sbi->s_mmp_tsk);
- 
 +      remove_proc_entry(EXT3_MAX_DIR_SIZE_NAME, sbi->s_dev_proc);
-       remove_proc_entry(sb->s_id, proc_root_ext3);
-       sbi->s_dev_proc = NULL;
-       sb->s_fs_info = NULL;
-@@ -1835,6 +1842,45 @@ failed:
+       if (sbi->s_dev_proc) {
+               remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
+               sbi->s_dev_proc = NULL;
+@@ -1854,6 +1861,45 @@ failed:
        return 1;
  }
  
@@ -90,7 +90,7 @@ Index: linux-2.6.16.60-0.27/fs/ext3/super.c
  
  static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  {
-@@ -1855,6 +1901,7 @@ static int ext3_fill_super (struct super
+@@ -1875,6 +1921,7 @@ static int ext3_fill_super (struct super
        int i;
        int needs_recovery;
        __le32 features;
@@ -98,7 +98,7 @@ Index: linux-2.6.16.60-0.27/fs/ext3/super.c
  
        sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
        if (!sbi)
-@@ -1874,6 +1921,23 @@ static int ext3_fill_super (struct super
+@@ -1903,6 +1950,23 @@ static int ext3_fill_super (struct super
  
        unlock_kernel();
  
@@ -122,19 +122,19 @@ Index: linux-2.6.16.60-0.27/fs/ext3/super.c
        blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE);
        if (!blocksize) {
                printk(KERN_ERR "EXT3-fs: unable to set blocksize\n");
-@@ -2309,6 +2373,7 @@ failed_mount:
+@@ -2338,6 +2402,7 @@ failed_mount:
        ext3_blkdev_remove(sbi);
        brelse(bh);
  out_fail:
 +      remove_proc_entry(EXT3_MAX_DIR_SIZE_NAME, sbi->s_dev_proc);
-       remove_proc_entry(sb->s_id, proc_root_ext3);
-       sbi->s_dev_proc = NULL;
-       sb->s_fs_info = NULL;
-Index: linux-2.6.16.60-0.27/include/linux/ext3_fs_sb.h
+       if (sbi->s_dev_proc) {
+               remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
+               sbi->s_dev_proc = NULL;
+Index: linux-2.6.18-92.1.17/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.6.16.60-0.27.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.16.60-0.27/include/linux/ext3_fs_sb.h
-@@ -121,6 +121,8 @@ struct ext3_sb_info {
+--- linux-2.6.18-92.1.17.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.18-92.1.17/include/linux/ext3_fs_sb.h
+@@ -132,6 +132,8 @@ struct ext3_sb_info {
        unsigned long s_mb_last_group;
        unsigned long s_mb_last_start;
  
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 ea3b19a..080bff0 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.9/fs/ext3/super.c
+Index: linux-2.6.9-67.0.22/fs/ext3/super.c
 ===================================================================
---- linux-2.6.9.orig/fs/ext3/super.c
-+++ linux-2.6.9/fs/ext3/super.c
+--- linux-2.6.9-67.0.22.orig/fs/ext3/super.c
++++ linux-2.6.9-67.0.22/fs/ext3/super.c
 @@ -35,6 +35,8 @@
  #include <linux/mount.h>
  #include <linux/namei.h>
@@ -11,17 +11,16 @@ Index: linux-2.6.9/fs/ext3/super.c
  #include <asm/uaccess.h>
  #include "xattr.h"
  #include "acl.h"
-@@ -440,6 +442,9 @@ void ext3_put_super (struct super_block 
+@@ -440,6 +442,8 @@ void ext3_put_super (struct super_block 
                invalidate_bdev(sbi->journal_bdev, 0);
                ext3_blkdev_remove(sbi);
        }
 +      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;
-@@ -1439,6 +1444,314 @@ 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;
+@@ -1430,6 +1434,314 @@ static unsigned long descriptor_loc(stru
        return (first_data_block + has_super + (bg * sbi->s_blocks_per_group));
  }
  
@@ -336,7 +335,7 @@ Index: linux-2.6.9/fs/ext3/super.c
  
  static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  {
-@@ -1738,6 +2051,11 @@ static int ext3_fill_super (struct super
+@@ -1754,6 +2066,11 @@ static int ext3_fill_super (struct super
                          EXT3_HAS_INCOMPAT_FEATURE(sb,
                                    EXT3_FEATURE_INCOMPAT_RECOVER));
  
@@ -348,7 +347,7 @@ Index: linux-2.6.9/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!
-@@ -2371,6 +2689,11 @@ int ext3_remount (struct super_block * s
+@@ -2404,6 +2721,11 @@ int ext3_remount (struct super_block * s
                                return ret;
                        if (!ext3_setup_super (sb, es, 0))
                                sb->s_flags &= ~MS_RDONLY;
@@ -360,11 +359,11 @@ Index: linux-2.6.9/fs/ext3/super.c
                }
        }
        return 0;
-Index: linux-2.6.9/include/linux/ext3_fs.h
+Index: linux-2.6.9-67.0.22/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.6.9.orig/include/linux/ext3_fs.h
-+++ linux-2.6.9/include/linux/ext3_fs.h
-@@ -577,13 +577,17 @@ struct ext3_super_block {
+--- linux-2.6.9-67.0.22.orig/include/linux/ext3_fs.h
++++ linux-2.6.9-67.0.22/include/linux/ext3_fs.h
+@@ -575,13 +575,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 */
@@ -385,7 +384,7 @@ Index: linux-2.6.9/include/linux/ext3_fs.h
  };
  
  #ifdef __KERNEL__
-@@ -667,12 +671,14 @@ static inline struct ext3_inode_info *EX
+@@ -665,12 +669,14 @@ static inline struct ext3_inode_info *EX
  #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV     0x0008 /* Journal device */
  #define EXT3_FEATURE_INCOMPAT_META_BG         0x0010
  #define EXT3_FEATURE_INCOMPAT_EXTENTS         0x0040 /* extents support */
@@ -401,7 +400,7 @@ Index: linux-2.6.9/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| \
-@@ -832,6 +838,39 @@ struct dir_private_info {
+@@ -830,6 +836,39 @@ struct dir_private_info {
  #define ERR_BAD_DX_DIR        -75000
  
  /*
@@ -441,11 +440,11 @@ Index: linux-2.6.9/include/linux/ext3_fs.h
   * Function prototypes
   */
  
-Index: linux-2.6.9/include/linux/ext3_fs_sb.h
+Index: linux-2.6.9-67.0.22/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.6.9.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.9/include/linux/ext3_fs_sb.h
-@@ -143,6 +143,7 @@ struct ext3_sb_info {
+--- linux-2.6.9-67.0.22.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.9-67.0.22/include/linux/ext3_fs_sb.h
+@@ -150,6 +150,7 @@ struct ext3_sb_info {
        /* locality groups */
        struct ext3_locality_group *s_locality_groups;
  
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 04635f5..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);
-+
-       remove_proc_entry(sb->s_id, proc_root_ext3);
-       sbi->s_dev_proc = NULL;
-       sb->s_fs_info = NULL;
-@@ -1529,6 +1534,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;
  
diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
index 26f86b8..1914c9a 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.18/fs/ext3/super.c
+Index: linux-2.6.18-92.1.17/fs/ext3/super.c
 ===================================================================
---- linux-2.6.18.orig/fs/ext3/super.c
-+++ linux-2.6.18/fs/ext3/super.c
+--- linux-2.6.18-92.1.17.orig/fs/ext3/super.c
++++ linux-2.6.18-92.1.17/fs/ext3/super.c
 @@ -35,6 +35,8 @@
  #include <linux/namei.h>
  #include <linux/quotaops.h>
@@ -11,17 +11,16 @@ Index: linux-2.6.18/fs/ext3/super.c
  
  #include <asm/uaccess.h>
  
-@@ -435,6 +437,9 @@ static void ext3_put_super (struct super
+@@ -435,6 +437,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);
-+
-       remove_proc_entry(sb->s_id, proc_root_ext3);
-       sbi->s_dev_proc = NULL;
-       sb->s_fs_info = NULL;
-@@ -1536,6 +1541,313 @@ static ext3_fsblk_t descriptor_loc(struc
+       if (sbi->s_dev_proc) {
+               remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
+               sbi->s_dev_proc = NULL;
+@@ -1543,6 +1547,313 @@ static ext3_fsblk_t descriptor_loc(struc
        return (has_super + ext3_group_first_block_no(sb, bg));
  }
  
@@ -335,7 +334,7 @@ Index: linux-2.6.18/fs/ext3/super.c
  
  static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  {
-@@ -1844,6 +2156,11 @@ static int ext3_fill_super (struct super
+@@ -1875,6 +2186,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.18/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!
-@@ -2446,7 +2763,7 @@ static int ext3_remount (struct super_bl
+@@ -2482,7 +2798,7 @@ static int ext3_remount (struct super_bl
        ext3_fsblk_t n_blocks_count = 0;
        unsigned long old_sb_flags;
        struct ext3_mount_options old_opts;
@@ -356,7 +355,7 @@ Index: linux-2.6.18/fs/ext3/super.c
  #ifdef CONFIG_QUOTA
        int i;
  #endif
-@@ -2530,6 +2847,11 @@ static int ext3_remount (struct super_bl
+@@ -2580,6 +2896,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.18/fs/ext3/super.c
                }
        }
  #ifdef CONFIG_QUOTA
-Index: linux-2.6.18/include/linux/ext3_fs.h
+Index: linux-2.6.18-92.1.17/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.6.18.orig/include/linux/ext3_fs.h
-+++ linux-2.6.18/include/linux/ext3_fs.h
-@@ -593,13 +593,17 @@ struct ext3_super_block {
+--- linux-2.6.18-92.1.17.orig/include/linux/ext3_fs.h
++++ linux-2.6.18-92.1.17/include/linux/ext3_fs.h
+@@ -594,13 +594,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.18/include/linux/ext3_fs.h
  };
  
  #ifdef __KERNEL__
-@@ -702,12 +706,14 @@ static inline int ext3_valid_inum(struct
+@@ -703,12 +707,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.18/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| \
-@@ -870,6 +876,39 @@ ext3_group_first_block_no(struct super_b
+@@ -871,6 +877,39 @@ ext3_group_first_block_no(struct super_b
  #define ERR_BAD_DX_DIR        -75000
  
  /*
@@ -449,11 +448,11 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
   * Function prototypes
   */
  
-Index: linux-2.6.18/include/linux/ext3_fs_sb.h
+Index: linux-2.6.18-92.1.17/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.6.18.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.18/include/linux/ext3_fs_sb.h
-@@ -151,6 +151,7 @@ struct ext3_sb_info {
+--- linux-2.6.18-92.1.17.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.18-92.1.17/include/linux/ext3_fs_sb.h
+@@ -158,6 +158,7 @@ struct ext3_sb_info {
        /* locality groups */
        struct ext3_locality_group *s_locality_groups;
  
diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch
index c7fd5f6..e041985 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.18/fs/ext3/super.c
+Index: linux-2.6.22.19/fs/ext3/super.c
 ===================================================================
---- linux-2.6.18.orig/fs/ext3/super.c
-+++ linux-2.6.18/fs/ext3/super.c
+--- linux-2.6.22.19.orig/fs/ext3/super.c
++++ linux-2.6.22.19/fs/ext3/super.c
 @@ -35,6 +35,8 @@
  #include <linux/namei.h>
  #include <linux/quotaops.h>
@@ -11,17 +11,16 @@ Index: linux-2.6.18/fs/ext3/super.c
  
  #include <asm/uaccess.h>
  
-@@ -435,6 +437,9 @@ static void ext3_put_super (struct super
-               invalidate_bdev(sbi->journal_bdev, 0);
+@@ -436,6 +438,8 @@ static void ext3_put_super (struct super
+               invalidate_bdev(sbi->journal_bdev);
                ext3_blkdev_remove(sbi);
        }
 +      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;
-@@ -1536,6 +1541,313 @@ static ext3_fsblk_t descriptor_loc(struc
+       if (sbi->s_dev_proc) {
+               remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
+               sbi->s_dev_proc = NULL;
+@@ -1538,6 +1542,313 @@ static ext3_fsblk_t descriptor_loc(struc
        return (has_super + ext3_group_first_block_no(sb, bg));
  }
  
@@ -335,7 +334,7 @@ Index: linux-2.6.18/fs/ext3/super.c
  
  static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  {
-@@ -1844,6 +2156,11 @@ static int ext3_fill_super (struct super
+@@ -1875,6 +2186,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.18/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!
-@@ -2446,7 +2763,7 @@ static int ext3_remount (struct super_bl
+@@ -2482,7 +2798,7 @@ static int ext3_remount (struct super_bl
        ext3_fsblk_t n_blocks_count = 0;
        unsigned long old_sb_flags;
        struct ext3_mount_options old_opts;
@@ -356,8 +355,8 @@ Index: linux-2.6.18/fs/ext3/super.c
  #ifdef CONFIG_QUOTA
        int i;
  #endif
-@@ -2530,6 +2847,11 @@ static int ext3_remount (struct super_bl
-                       }
+@@ -2580,6 +2896,11 @@ static int ext3_remount (struct super_bl
+                               goto restore_opts;
                        if (!ext3_setup_super (sb, es, 0))
                                sb->s_flags &= ~MS_RDONLY;
 +                      if (EXT3_HAS_INCOMPAT_FEATURE(sb,
@@ -368,11 +367,11 @@ Index: linux-2.6.18/fs/ext3/super.c
                }
        }
  #ifdef CONFIG_QUOTA
-Index: linux-2.6.18/include/linux/ext3_fs.h
+Index: linux-2.6.22.19/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.6.18.orig/include/linux/ext3_fs.h
-+++ linux-2.6.18/include/linux/ext3_fs.h
-@@ -593,13 +593,17 @@ struct ext3_super_block {
+--- linux-2.6.22.19.orig/include/linux/ext3_fs.h
++++ linux-2.6.22.19/include/linux/ext3_fs.h
+@@ -608,13 +608,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.18/include/linux/ext3_fs.h
  };
  
  #ifdef __KERNEL__
-@@ -702,12 +706,14 @@ static inline int ext3_valid_inum(struct
+@@ -717,12 +721,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.18/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| \
-@@ -870,6 +876,39 @@ ext3_group_first_block_no(struct super_b
+@@ -885,6 +891,39 @@ ext3_group_first_block_no(struct super_b
  #define ERR_BAD_DX_DIR        -75000
  
  /*
@@ -449,11 +448,11 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
   * Function prototypes
   */
  
-Index: linux-2.6.18/include/linux/ext3_fs_sb.h
+Index: linux-2.6.22.19/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.6.18.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.18/include/linux/ext3_fs_sb.h
-@@ -151,6 +151,7 @@ struct ext3_sb_info {
+--- linux-2.6.22.19.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.22.19/include/linux/ext3_fs_sb.h
+@@ -158,6 +158,7 @@ struct ext3_sb_info {
        /* locality groups */
        struct ext3_locality_group *s_locality_groups;
  
Lustre primary development and releases