X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext3-nanosecond-2.6-suse.patch;h=7824114a60b9c1f68a299781c82f1046364c626e;hb=144b8d66bc68118da9f0f1683ad79d8e6faa0c5f;hp=0453cf9a6e1b036a688b47040fed2fe9f9b09d9a;hpb=e844d81eb1e7c4ba65240feca42698212659f813;p=fs%2Flustre-release.git

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 0453cf9..7824114 100644
--- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
@@ -133,11 +133,11 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
  	__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;
+-	__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 */
 +	__u32	s_first_meta_bg;	/* First metablock block group */
 +	__u32	s_mkfs_time;		/* When the filesystem was created */
@@ -153,16 +153,16 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
  
  #ifdef __KERNEL__
 @@ -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 EXT4_FEATURE_RO_COMPAT_GDT_CSUM		0x0010
  #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| \
+ 					 EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
  					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
 +					 EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
  					 EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
@@ -172,24 +172,24 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs_i.h
 ===================================================================
 --- linux-2.6.5-7.283.orig/include/linux/ext3_fs_i.h
 +++ linux-2.6.5-7.283/include/linux/ext3_fs_i.h
-@@ -131,6 +131,7 @@ struct ext3_inode_info {
- 	struct inode vfs_inode;
+@@ -130,6 +130,7 @@ struct ext3_inode_info {
  
- 	struct ext3_ext_cache i_cached_extent;
+ 	/* on-disk additional length */
+ 	__u16 i_extra_isize;
 +	struct timespec i_crtime;
- };
  
- #endif	/* _LINUX_EXT3_FS_I */
+ 	/*
+ 	 * truncate_sem is for serialising ext3_truncate() against
 Index: linux-2.6.5-7.283/include/linux/ext3_fs_sb.h
 ===================================================================
 --- linux-2.6.5-7.283.orig/include/linux/ext3_fs_sb.h
 +++ linux-2.6.5-7.283/include/linux/ext3_fs_sb.h
-@@ -119,6 +119,8 @@ struct ext3_sb_info {
- 	spinlock_t s_bal_lock;
- 	unsigned long s_mb_buddies_generated;
- 	unsigned long long s_mb_generation_time;
-+
-+	unsigned int s_want_extra_isize; /* New inodes should reserve # bytes */
- };
+@@ -71,6 +71,8 @@ struct ext3_sb_info {
+ 	/* Last group used to allocate inode */
+ 	int s_last_alloc_group;
  
- #define EXT3_GROUP_INFO(sb, group)					   \
++	unsigned int s_want_extra_isize; /* New inodes should reserve # bytes */
++
+ 	/* root of the per fs reservation window tree */
+ 	spinlock_t s_rsv_window_lock;
+ 	struct rb_root s_rsv_window_root;