From: nic <nic>
Date: Thu, 18 Mar 2004 00:18:43 +0000 (+0000)
Subject: b=2805
X-Git-Tag: v1_8_0_110~486^6~66
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=1997d2cf3feab80b6c1dde488c48f2be08331ba9;p=fs%2Flustre-release.git

b=2805

add inode-max-readahead-2.4.24 patch and update kernel series
---

diff --git a/lustre/kernel_patches/patches/inode-max-readahead-2.4.24.patch b/lustre/kernel_patches/patches/inode-max-readahead-2.4.24.patch
new file mode 100644
index 0000000..9203859
--- /dev/null
+++ b/lustre/kernel_patches/patches/inode-max-readahead-2.4.24.patch
@@ -0,0 +1,22 @@
+--- linux-2.4.24-l32/mm/filemap.c.inode_ramax	2004-03-14 13:16:21.000000000 -0800
++++ linux-2.4.24-l32/mm/filemap.c	2004-03-16 10:57:14.000000000 -0800
+@@ -1226,6 +1226,8 @@
+ 
+ static inline int get_max_readahead(struct inode * inode)
+ {
++	if (inode->i_mapping->a_ops->max_readahead)
++		return inode->i_mapping->a_ops->max_readahead(inode);
+ 	if (!inode->i_dev || !max_readahead[MAJOR(inode->i_dev)])
+ 		return vm_max_readahead;
+ 	return max_readahead[MAJOR(inode->i_dev)][MINOR(inode->i_dev)];
+--- linux-2.4.24-l32/include/linux/fs.h.inode_ramax	2004-03-14 13:15:49.000000000 -0800
++++ linux-2.4.24-l32/include/linux/fs.h	2004-03-15 11:56:56.000000000 -0800
+@@ -410,6 +410,8 @@
+ #define KERNEL_HAS_DIRECT_FILEIO /* Unfortunate kludge due to lack of foresight */
+ 	int (*direct_fileIO)(int, struct file *, struct kiobuf *, unsigned long, int);
+ 	void (*removepage)(struct page *); /* called when page gets removed from the inode */
++#define KERNEL_HAS_AS_MAX_READAHEAD
++	int (*max_readahead)(struct inode *);
+ };
+ 
+ struct address_space {
diff --git a/lustre/kernel_patches/series/hp-pnnl-2.4.20 b/lustre/kernel_patches/series/hp-pnnl-2.4.20
index 7291116..f1130c6 100644
--- a/lustre/kernel_patches/series/hp-pnnl-2.4.20
+++ b/lustre/kernel_patches/series/hp-pnnl-2.4.20
@@ -42,3 +42,4 @@ gfp_memalloc-2.4.22.patch
 ext3-xattr-ptr-arith-fix.patch
 procfs-ndynamic-2.4.patch
 ext3-truncate-buffer-head.patch
+inode-max-readahead-2.4.24.patch