From 2d3063196c81ad460b05bdb848631d88a6bde9ac Mon Sep 17 00:00:00 2001
From: alex <alex>
Date: Thu, 23 Sep 2004 09:43:14 +0000
Subject: [PATCH] - broken patch was committed last time

---
 .../patches/ext3-mds-num-2.4.24.patch              | 38 ++++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/lustre/kernel_patches/patches/ext3-mds-num-2.4.24.patch b/lustre/kernel_patches/patches/ext3-mds-num-2.4.24.patch
index c524f01..e0b1763 100644
--- a/lustre/kernel_patches/patches/ext3-mds-num-2.4.24.patch
+++ b/lustre/kernel_patches/patches/ext3-mds-num-2.4.24.patch
@@ -1,7 +1,7 @@
 Index: linux-2.4.24/fs/ext3/namei.c
 ===================================================================
---- linux-2.4.24.orig/fs/ext3/namei.c	2004-09-12 17:52:58.000000000 +0400
-+++ linux-2.4.24/fs/ext3/namei.c	2004-09-12 17:53:10.000000000 +0400
+--- linux-2.4.24.orig/fs/ext3/namei.c	2004-09-23 13:10:48.181661672 +0400
++++ linux-2.4.24/fs/ext3/namei.c	2004-09-23 13:10:48.274647536 +0400
 @@ -1099,6 +1099,23 @@
  	inode = NULL;
  	if (bh) {
@@ -186,8 +186,8 @@ Index: linux-2.4.24/fs/ext3/namei.c
  struct inode_operations ext3_dir_inode_operations = {
 Index: linux-2.4.24/fs/ext3/dir.c
 ===================================================================
---- linux-2.4.24.orig/fs/ext3/dir.c	2004-08-07 16:35:23.000000000 +0400
-+++ linux-2.4.24/fs/ext3/dir.c	2004-09-12 17:53:10.000000000 +0400
+--- linux-2.4.24.orig/fs/ext3/dir.c	2004-09-23 13:10:45.649046688 +0400
++++ linux-2.4.24/fs/ext3/dir.c	2004-09-23 13:10:48.275647384 +0400
 @@ -42,6 +42,9 @@
  
  static unsigned char get_dtype(struct super_block *sb, int filetype)
@@ -213,8 +213,8 @@ Index: linux-2.4.24/fs/ext3/dir.c
  		ext3_error (dir->i_sb, function,
 Index: linux-2.4.24/fs/ext3/ext3-exports.c
 ===================================================================
---- linux-2.4.24.orig/fs/ext3/ext3-exports.c	2004-08-07 16:35:24.000000000 +0400
-+++ linux-2.4.24/fs/ext3/ext3-exports.c	2004-09-12 17:53:10.000000000 +0400
+--- linux-2.4.24.orig/fs/ext3/ext3-exports.c	2004-09-23 13:10:46.365937704 +0400
++++ linux-2.4.24/fs/ext3/ext3-exports.c	2004-09-23 13:10:48.275647384 +0400
 @@ -26,3 +26,10 @@
  EXPORT_SYMBOL(ext3_decode_error);
  EXPORT_SYMBOL(__ext3_std_error);
@@ -228,9 +228,19 @@ Index: linux-2.4.24/fs/ext3/ext3-exports.c
 +
 Index: linux-2.4.24/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.4.24.orig/include/linux/ext3_fs.h	2004-09-12 17:52:58.000000000 +0400
-+++ linux-2.4.24/include/linux/ext3_fs.h	2004-09-12 18:11:02.000000000 +0400
-@@ -519,11 +519,13 @@
+--- linux-2.4.24.orig/include/linux/ext3_fs.h	2004-09-23 13:10:48.188660608 +0400
++++ linux-2.4.24/include/linux/ext3_fs.h	2004-09-23 13:17:40.703948752 +0400
+@@ -446,7 +446,8 @@
+ 	__u8	s_def_hash_version;	/* Default hash version to use */
+ 	__u8	s_reserved_char_pad;
+ 	__u16	s_reserved_word_pad;
+-	__u32	s_reserved[192];	/* Padding to the end of the block */
++	__u32	s_mdsnum;
++	__u32	s_reserved[191];	/* Padding to the end of the block */
+ };
+ 
+ #ifdef __KERNEL__
+@@ -519,11 +520,13 @@
  #define EXT3_FEATURE_INCOMPAT_FILETYPE		0x0002
  #define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004 /* Needs recovery */
  #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008 /* Journal device */
@@ -244,7 +254,7 @@ Index: linux-2.4.24/include/linux/ext3_fs.h
  					 EXT3_FEATURE_INCOMPAT_EXTENTS)
  #define EXT3_FEATURE_RO_COMPAT_SUPP	(EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
  					 EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
-@@ -585,6 +587,9 @@
+@@ -585,6 +588,9 @@
  #define EXT3_DIR_ROUND			(EXT3_DIR_PAD - 1)
  #define EXT3_DIR_REC_LEN(name_len)	(((name_len) + 8 + EXT3_DIR_ROUND) & \
  					 ~EXT3_DIR_ROUND)
@@ -256,8 +266,8 @@ Index: linux-2.4.24/include/linux/ext3_fs.h
   * (c) Daniel Phillips, 2001
 Index: linux-2.4.24/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.4.24.orig/include/linux/ext3_fs_sb.h	2004-08-10 16:10:54.000000000 +0400
-+++ linux-2.4.24/include/linux/ext3_fs_sb.h	2004-09-12 18:11:38.000000000 +0400
+--- linux-2.4.24.orig/include/linux/ext3_fs_sb.h	2004-09-23 13:10:46.069982696 +0400
++++ linux-2.4.24/include/linux/ext3_fs_sb.h	2004-09-23 13:11:21.026668472 +0400
 @@ -86,6 +86,7 @@
  	wait_queue_head_t s_delete_thread_queue;
  	wait_queue_head_t s_delete_waiter_queue;
@@ -268,8 +278,8 @@ Index: linux-2.4.24/include/linux/ext3_fs_sb.h
  #endif	/* _LINUX_EXT3_FS_SB */
 Index: linux-2.4.24/include/linux/dcache.h
 ===================================================================
---- linux-2.4.24.orig/include/linux/dcache.h	2004-08-07 16:35:23.000000000 +0400
-+++ linux-2.4.24/include/linux/dcache.h	2004-09-12 18:11:38.000000000 +0400
+--- linux-2.4.24.orig/include/linux/dcache.h	2004-09-23 13:10:46.153969928 +0400
++++ linux-2.4.24/include/linux/dcache.h	2004-09-23 13:11:06.451884176 +0400
 @@ -120,6 +120,9 @@
  	atomic_t d_count;
  	unsigned int d_flags;
-- 
1.8.3.1