Whamcloud - gitweb
Branch b1_6
[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-nanosecond-2.6-sles10.patch
index eb3d0c2..04c6e61 100644 (file)
@@ -348,8 +348,8 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h
  
  #ifdef __KERNEL__
 @@ -583,6 +648,8 @@ 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
 +
@@ -357,8 +357,8 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION     0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE                0x0002
 @@ -599,6 +666,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)
@@ -381,24 +381,24 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs_i.h
 ===================================================================
 --- linux-2.6.16.27-0.9.orig/include/linux/ext3_fs_i.h
 +++ linux-2.6.16.27-0.9/include/linux/ext3_fs_i.h
-@@ -135,6 +135,7 @@ struct ext3_inode_info {
-       struct inode vfs_inode;
+@@ -130,6 +130,7 @@ struct ext3_inode_info {
  
-       __u32 i_cached_extent[4];
+       /* on-disk additional length */
+       __u16 i_extra_isize;
 +      struct timespec i_crtime;
  
-       void *i_filterdata;
- };
+       /*
+        * truncate_sem is for serialising ext3_truncate() against
 Index: linux-2.6.16.27-0.9/include/linux/ext3_fs_sb.h
 ===================================================================
 --- linux-2.6.16.27-0.9.orig/include/linux/ext3_fs_sb.h
 +++ linux-2.6.16.27-0.9/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;