Branch HEAD

[fs/lustre-release.git] / lustre / kernel_patches / patches / ext3-nanosecond-2.6-suse.patch

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 35d2191..2f90bc2 100644 (file)
--- 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)
  
  /*