From e844d81eb1e7c4ba65240feca42698212659f813 Mon Sep 17 00:00:00 2001 From: adilger Date: Thu, 10 May 2007 19:14:40 +0000 Subject: [PATCH] Branch HEAD Fix the nanosecond timestamp patches to declare all of the missing fields in the kernel patches. b=10651 i=green i=kalpak --- .../patches/ext3-nanosecond-2.6-rhel4.patch | 21 ++++++++++++++---- .../patches/ext3-nanosecond-2.6-sles10.patch | 21 ++++++++++++++---- .../patches/ext3-nanosecond-2.6-suse.patch | 25 ++++++++++++++++------ .../patches/ext3-nanosecond-2.6.18-vanilla.patch | 23 ++++++++++++++------ .../patches/ext3-nanosecond-2.6-rhel4.patch | 21 ++++++++++++++---- .../patches/ext3-nanosecond-2.6-sles10.patch | 21 ++++++++++++++---- .../patches/ext3-nanosecond-2.6-suse.patch | 25 ++++++++++++++++------ .../patches/ext3-nanosecond-2.6.18-vanilla.patch | 23 ++++++++++++++------ 8 files changed, 140 insertions(+), 40 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 1bd6226e..423a399 100644 --- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch +++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch @@ -321,14 +321,27 @@ Index: linux-2.6.9-rhel4/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 -@@ -490,7 +553,9 @@ struct ext3_super_block { - __u16 s_reserved_word_pad; +@@ -485,11 +548,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 */ +- __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 */ ++ __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_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 */ -+ __u32 s_reserved[189]; /* Padding to the end of the block */ ++ __le32 s_flags; /* Miscellaneous flags */ ++ __u32 s_reserved[167]; /* Padding to the end of the block */ }; #ifdef __KERNEL__ 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 5cde637..eb3d0c2 100644 --- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch @@ -323,14 +323,27 @@ Index: linux-2.6.16.27-0.9/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 -@@ -508,7 +571,9 @@ struct ext3_super_block { - __u16 s_reserved_word_pad; +@@ -504,11 +567,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 */ +- __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 */ ++ __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_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 */ -+ __u32 s_reserved[189]; /* Padding to the end of the block */ ++ __le32 s_flags; /* Miscellaneous flags */ ++ __u32 s_reserved[167]; /* Padding to the end of the block */ }; #ifdef __KERNEL__ 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 2f90bc2..0453cf9 100644 --- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch +++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch @@ -128,14 +128,27 @@ Index: linux-2.6.5-7.283/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 -@@ -464,7 +479,9 @@ struct ext3_super_block { - __u16 s_reserved_word_pad; +@@ -460,11 +475,19 @@ struct ext3_super_block { + __u32 s_last_orphan; /* start of list of inodes to delete */ + __u32 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 */ ++ __u16 s_desc_size; /* Group desc. size: INCOMPAT_64BIT */ __u32 s_default_mount_opts; - __u32 s_first_meta_bg; /* First metablock block group */ +- __u32 s_first_meta_bg; /* First metablock block group */ - __u32 s_reserved[190]; /* Padding to the end of the block */ -+ __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 */ ++ __u32 s_first_meta_bg; /* First metablock block group */ ++ __u32 s_mkfs_time; /* When the filesystem was created */ ++ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */ ++ __u32 s_blocks_count_hi; /* Blocks count high 32 bits */ ++ __u32 s_r_blocks_count_hi; /* Reserved blocks count high 32 bits*/ ++ __u32 s_free_blocks_hi; /* Free blocks count high 32 bits */ ++ __u16 s_min_extra_isize; /* All inodes have at least # bytes */ ++ __u16 s_want_extra_isize; /* New inodes should reserve # bytes */ ++ __u32 s_flags; /* Miscellaneous flags */ ++ __u32 s_reserved[167]; /* Padding to the end of the block */ }; #ifdef __KERNEL__ 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 --- 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__ 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 1bd6226e..423a399 100644 --- a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch +++ b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch @@ -321,14 +321,27 @@ Index: linux-2.6.9-rhel4/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 -@@ -490,7 +553,9 @@ struct ext3_super_block { - __u16 s_reserved_word_pad; +@@ -485,11 +548,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 */ +- __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 */ ++ __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_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 */ -+ __u32 s_reserved[189]; /* Padding to the end of the block */ ++ __le32 s_flags; /* Miscellaneous flags */ ++ __u32 s_reserved[167]; /* Padding to the end of the block */ }; #ifdef __KERNEL__ 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 5cde637..eb3d0c2 100644 --- a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch +++ b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch @@ -323,14 +323,27 @@ Index: linux-2.6.16.27-0.9/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 -@@ -508,7 +571,9 @@ struct ext3_super_block { - __u16 s_reserved_word_pad; +@@ -504,11 +567,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 */ +- __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 */ ++ __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_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 */ -+ __u32 s_reserved[189]; /* Padding to the end of the block */ ++ __le32 s_flags; /* Miscellaneous flags */ ++ __u32 s_reserved[167]; /* Padding to the end of the block */ }; #ifdef __KERNEL__ 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 2f90bc2..0453cf9 100644 --- a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch +++ b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch @@ -128,14 +128,27 @@ Index: linux-2.6.5-7.283/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 -@@ -464,7 +479,9 @@ struct ext3_super_block { - __u16 s_reserved_word_pad; +@@ -460,11 +475,19 @@ struct ext3_super_block { + __u32 s_last_orphan; /* start of list of inodes to delete */ + __u32 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 */ ++ __u16 s_desc_size; /* Group desc. size: INCOMPAT_64BIT */ __u32 s_default_mount_opts; - __u32 s_first_meta_bg; /* First metablock block group */ +- __u32 s_first_meta_bg; /* First metablock block group */ - __u32 s_reserved[190]; /* Padding to the end of the block */ -+ __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 */ ++ __u32 s_first_meta_bg; /* First metablock block group */ ++ __u32 s_mkfs_time; /* When the filesystem was created */ ++ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */ ++ __u32 s_blocks_count_hi; /* Blocks count high 32 bits */ ++ __u32 s_r_blocks_count_hi; /* Reserved blocks count high 32 bits*/ ++ __u32 s_free_blocks_hi; /* Free blocks count high 32 bits */ ++ __u16 s_min_extra_isize; /* All inodes have at least # bytes */ ++ __u16 s_want_extra_isize; /* New inodes should reserve # bytes */ ++ __u32 s_flags; /* Miscellaneous flags */ ++ __u32 s_reserved[167]; /* Padding to the end of the block */ }; #ifdef __KERNEL__ 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 cee1f15..6dd7ad7 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 @@ -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__ -- 1.8.3.1