From: kalpak <kalpak>
Date: Wed, 18 Apr 2007 11:37:20 +0000 (+0000)
Subject: b=10651
X-Git-Tag: v1_7_100~178
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=d95fa14d01af833d74a4ab7d5b19714e22fdaf97

b=10651

This patch was not applying due to some whitespace changes made in ext3-nlinks-2.6.9.patch by Andreas.
I have modified the nanosecond patch to reflect the changes.
---

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 006350b..e0df0f4 100644
--- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
@@ -332,24 +332,23 @@ Index: linux-2.6.9-rhel4/include/linux/ext3_fs.h
  };
  
  #ifdef __KERNEL__
-@@ -565,6 +630,8 @@ static inline struct ext3_inode_info *EX
+@@ -565,6 +630,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 EXT3_FEATURE_RO_COMPAT_DIR_NLINK      	0x0020
+ #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK	0x0020
 +#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE	0x0040
-+
  
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION	0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE		0x0002
-@@ -581,6 +648,7 @@ static inline struct ext3_inode_info *EX
+@@ -581,6 +647,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| \
- 					 EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
+ 					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
 +					 EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
  					 EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
  
  /*
-@@ -708,6 +776,12 @@ static inline struct ext3_inode *ext3_ra
+@@ -708,6 +775,12 @@ static inline struct ext3_inode *ext3_ra
  	return (struct ext3_inode *) (iloc->bh->b_data + iloc->offset);
  }
  
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 006350b..e0df0f4 100644
--- a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
+++ b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-rhel4.patch
@@ -332,24 +332,23 @@ Index: linux-2.6.9-rhel4/include/linux/ext3_fs.h
  };
  
  #ifdef __KERNEL__
-@@ -565,6 +630,8 @@ static inline struct ext3_inode_info *EX
+@@ -565,6 +630,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 EXT3_FEATURE_RO_COMPAT_DIR_NLINK      	0x0020
+ #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK	0x0020
 +#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE	0x0040
-+
  
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION	0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE		0x0002
-@@ -581,6 +648,7 @@ static inline struct ext3_inode_info *EX
+@@ -581,6 +647,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| \
- 					 EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
+ 					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
 +					 EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
  					 EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
  
  /*
-@@ -708,6 +776,12 @@ static inline struct ext3_inode *ext3_ra
+@@ -708,6 +775,12 @@ static inline struct ext3_inode *ext3_ra
  	return (struct ext3_inode *) (iloc->bh->b_data + iloc->offset);
  }