From c8dbc360843d798bba48a96bf1bde618533a1270 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Fri, 20 Apr 2007 20:35:10 +0000
Subject: [PATCH] Branch HEAD Use EXT4_ for feature flag instead of EXT3_ to
match upstream. b=10651
---
.../patches/ext3-nanosecond-2.6-rhel4.patch | 6 +++---
.../patches/ext3-nanosecond-2.6-sles10.patch | 10 +++++-----
.../patches/ext3-nanosecond-2.6-suse.patch | 10 +++++-----
.../patches/ext3-nanosecond-2.6.18-vanilla.patch | 10 +++++-----
.../patches/ext3-nanosecond-2.6-rhel4.patch | 6 +++---
.../patches/ext3-nanosecond-2.6-sles10.patch | 10 +++++-----
.../patches/ext3-nanosecond-2.6-suse.patch | 10 +++++-----
.../patches/ext3-nanosecond-2.6.18-vanilla.patch | 10 +++++-----
8 files changed, 36 insertions(+), 36 deletions(-)
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 e0df0f47e2..1bd6226e41 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 1960ae1136..daa999e436 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 35d2191d9f..2f90bc2d5d 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 99e9350a36..cee1f15085 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 e0df0f47e2..1bd6226e41 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 1960ae1136..daa999e436 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 35d2191d9f..2f90bc2d5d 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 99e9350a36..cee1f15085 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)
/*
--
GitLab