diff --git a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
index e0df0f47e2e1cc7266d64e777e18229ae1a8b98a..1bd6226e411f5030d9fb6d3447942547aef4f55a 100644
--- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
@@ -198,7 +198,7 @@ Index: linux-2.6.9-rhel4/fs/ext3/super.c
+ sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
+ EXT3_GOOD_OLD_INODE_SIZE;
+ if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
+ if (sbi->s_want_extra_isize <
+ le16_to_cpu(es->s_want_extra_isize))
+ sbi->s_want_extra_isize =
@@ -336,7 +336,7 @@ Index: linux-2.6.9-rhel4/include/linux/ext3_fs.h
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
-+#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
@@ -344,7 +344,7 @@ Index: linux-2.6.9-rhel4/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_DIR_NLINK| \
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/*
diff --git a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch
index 1960ae113682c9ccffa5534077d2860425dc13be..daa999e4361be8238dd29bce9003786f4ee34665 100644
--- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch
@@ -198,7 +198,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c
+ sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
+ EXT3_GOOD_OLD_INODE_SIZE;
+ if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
+ if (sbi->s_want_extra_isize <
+ le16_to_cpu(es->s_want_extra_isize))
+ sbi->s_want_extra_isize =
@@ -337,8 +337,8 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h
@@ -583,6 +648,8 @@ static inline struct ext3_inode_info *EX
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
- #define EXT3_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
-+#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+ #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+
#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
@@ -346,8 +346,8 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h
@@ -599,6 +666,7 @@ static inline struct ext3_inode_info *EX
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
- EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/*
diff --git a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
index 35d2191d9f3a53eeff05922391a2bfed575b6a53..2f90bc2d5d95e844a7a6c85eef5c0a585859d55e 100644
--- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
@@ -66,7 +66,7 @@ Index: linux-2.6.5-7.283/fs/ext3/super.c
+ sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
+ EXT3_GOOD_OLD_INODE_SIZE;
+ if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
+ if (sbi->s_want_extra_isize <
+ le16_to_cpu(es->s_want_extra_isize))
+ sbi->s_want_extra_isize =
@@ -142,16 +142,16 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
@@ -539,6 +556,7 @@ static inline struct ext3_inode_info *EX
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
- #define EXT3_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
-+#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+ #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
@@ -555,6 +573,7 @@ static inline struct ext3_inode_info *EX
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
- EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/*
diff --git a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.18-vanilla.patch
index 99e9350a3666f4a61d1d8217467796d7a4bc89a1..cee1f15085dbad04e40fd38cf78ff1b9c2aa5555 100644
--- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.18-vanilla.patch
@@ -198,7 +198,7 @@ Index: linux-2.6.18/fs/ext3/super.c
+ sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
+ EXT3_GOOD_OLD_INODE_SIZE;
+ if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
+ if (sbi->s_want_extra_isize <
+ le16_to_cpu(es->s_want_extra_isize))
+ sbi->s_want_extra_isize =
@@ -351,8 +351,8 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
@@ -590,6 +662,8 @@ static inline int ext3_valid_inum(struct
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
- #define EXT3_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
-+#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+ #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+
#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
@@ -360,8 +360,8 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
@@ -606,6 +680,7 @@ static inline int ext3_valid_inum(struct
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
- EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/*
diff --git a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
index e0df0f47e2e1cc7266d64e777e18229ae1a8b98a..1bd6226e411f5030d9fb6d3447942547aef4f55a 100644
--- a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
+++ b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
@@ -198,7 +198,7 @@ Index: linux-2.6.9-rhel4/fs/ext3/super.c
+ sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
+ EXT3_GOOD_OLD_INODE_SIZE;
+ if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
+ if (sbi->s_want_extra_isize <
+ le16_to_cpu(es->s_want_extra_isize))
+ sbi->s_want_extra_isize =
@@ -336,7 +336,7 @@ Index: linux-2.6.9-rhel4/include/linux/ext3_fs.h
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
-+#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
@@ -344,7 +344,7 @@ Index: linux-2.6.9-rhel4/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_DIR_NLINK| \
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/*
diff --git a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch
index 1960ae113682c9ccffa5534077d2860425dc13be..daa999e4361be8238dd29bce9003786f4ee34665 100644
--- a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch
+++ b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch
@@ -198,7 +198,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c
+ sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
+ EXT3_GOOD_OLD_INODE_SIZE;
+ if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
+ if (sbi->s_want_extra_isize <
+ le16_to_cpu(es->s_want_extra_isize))
+ sbi->s_want_extra_isize =
@@ -337,8 +337,8 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h
@@ -583,6 +648,8 @@ static inline struct ext3_inode_info *EX
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
- #define EXT3_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
-+#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+ #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+
#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
@@ -346,8 +346,8 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h
@@ -599,6 +666,7 @@ static inline struct ext3_inode_info *EX
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
- EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/*
diff --git a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
index 35d2191d9f3a53eeff05922391a2bfed575b6a53..2f90bc2d5d95e844a7a6c85eef5c0a585859d55e 100644
--- a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
@@ -66,7 +66,7 @@ Index: linux-2.6.5-7.283/fs/ext3/super.c
+ sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
+ EXT3_GOOD_OLD_INODE_SIZE;
+ if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
+ if (sbi->s_want_extra_isize <
+ le16_to_cpu(es->s_want_extra_isize))
+ sbi->s_want_extra_isize =
@@ -142,16 +142,16 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
@@ -539,6 +556,7 @@ static inline struct ext3_inode_info *EX
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
- #define EXT3_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
-+#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+ #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
@@ -555,6 +573,7 @@ static inline struct ext3_inode_info *EX
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
- EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/*
diff --git a/lustre/kernel_patches/patches/ext3-nanosecond-2.6.18-vanilla.patch b/lustre/kernel_patches/patches/ext3-nanosecond-2.6.18-vanilla.patch
index 99e9350a3666f4a61d1d8217467796d7a4bc89a1..cee1f15085dbad04e40fd38cf78ff1b9c2aa5555 100644
--- a/lustre/kernel_patches/patches/ext3-nanosecond-2.6.18-vanilla.patch
+++ b/lustre/kernel_patches/patches/ext3-nanosecond-2.6.18-vanilla.patch
@@ -198,7 +198,7 @@ Index: linux-2.6.18/fs/ext3/super.c
+ sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
+ EXT3_GOOD_OLD_INODE_SIZE;
+ if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
+ if (sbi->s_want_extra_isize <
+ le16_to_cpu(es->s_want_extra_isize))
+ sbi->s_want_extra_isize =
@@ -351,8 +351,8 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
@@ -590,6 +662,8 @@ static inline int ext3_valid_inum(struct
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
- #define EXT3_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
-+#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+ #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+
#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
@@ -360,8 +360,8 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
@@ -606,6 +680,7 @@ static inline int ext3_valid_inum(struct
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
- EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
-+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/*