Modified ChangeLog entry.

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

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 99e9350..6dd7ad7 100644 (file)
--- 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 =
@@ -321,16 +321,27 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
  #if defined(__KERNEL__) || defined(__linux__)
  #define i_reserved1   osd1.linux1.l_i_reserved1
  #define i_frag                osd2.linux2.l_i_frag
-@@ -503,8 +566,10 @@ struct ext3_super_block {
-       __u8    s_reserved_char_pad;
-       __u16   s_reserved_word_pad;
+@@ -498,11 +562,19 @@ struct ext3_super_block {
+       __le32  s_last_orphan;          /* start of list of inodes to delete */
+       __le32  s_hash_seed[4];         /* HTREE hash seed */
+       __u8    s_def_hash_version;     /* Default hash version to use */
+-      __u8    s_reserved_char_pad;
+-      __u16   s_reserved_word_pad;
++      __u8    s_jnl_backup_type;      /* Default type of journal backup */
++      __le16  s_desc_size;            /* Group desc. size: INCOMPAT_64BIT */
        __le32  s_default_mount_opts;
 -      __le32  s_first_meta_bg;        /* First metablock block group */
 -      __u32   s_reserved[190];        /* Padding to the end of the block */
 +      __le32  s_first_meta_bg;        /* First metablock block group */
-+      __le16  s_min_extra_isize;      /* All inodes have at least # bytes */
-+      __le16  s_want_extra_isize;     /* New inodes should reserve # bytes */
-+      __u32   s_reserved[189];        /* Padding to the end of the block */
++      __le32  s_mkfs_time;            /* When the filesystem was created */
++      __le32  s_jnl_blocks[17];       /* Backup of the journal inode */
++      __le32  s_blocks_count_hi;      /* Blocks count high 32 bits */
++      __le32  s_r_blocks_count_hi;    /* Reserved blocks count high 32 bits*/
++      __le32  s_free_blocks_count_hi; /* Free blocks count high 32 bits */
++      __le16  s_min_extra_isize;      /* All inodes have at least # bytes */
++      __le16  s_want_extra_isize;     /* New inodes should reserve # bytes */
++      __le32  s_flags;                /* Miscellaneous flags */
++      __u32   s_reserved[167];        /* Padding to the end of the block */
  };
  
  #ifdef __KERNEL__
@@ -351,8 +362,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 +371,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)
  
  /*