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 cee1f15..6dd7ad7 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
@@ -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__