Branch HEAD

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-nanosecond-2.6.18-vanilla.patch

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 99e9350..cee1f15 100644 (file)
--- 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)
  
  /*