- Phil's intent fix for middle of symlink lookups.

- Update version

diff --git a/lustre/kernel_patches/patches/lustre_version.patch b/lustre/kernel_patches/patches/lustre_version.patch
index 6fb5ce2..2e69e01 100644 (file)
--- a/lustre/kernel_patches/patches/lustre_version.patch
+++ b/lustre/kernel_patches/patches/lustre_version.patch
@@ -6,6 +6,6 @@
 --- /dev/null  2002-08-30 16:31:37.000000000 -0700
 +++ linux-2.4.18-17.8.0-zab/include/linux/lustre_version.h     2002-12-06 14:52:30.000000000 -0800
 @@ -0,0 +1 @@
-+#define LUSTRE_KERNEL_VERSION 4
++#define LUSTRE_KERNEL_VERSION 5
 
 _

diff --git a/lustre/kernel_patches/patches/patch-2.4.18-hp1_pnnl18.2.8qsnet.patch b/lustre/kernel_patches/patches/patch-2.4.18-hp1_pnnl18.2.8qsnet.patch
index 4c99e3c..f25baa4 100644 (file)
--- a/lustre/kernel_patches/patches/patch-2.4.18-hp1_pnnl18.2.8qsnet.patch
+++ b/lustre/kernel_patches/patches/patch-2.4.18-hp1_pnnl18.2.8qsnet.patch
@@ -1,7 +1,7 @@
 --- linux-pristine/./include/linux/lustre_version.h    Wed Dec 31 19:00:00 1969
 +++ linux/./include/linux/lustre_version.h     Tue Nov 26 07:02:14 2002
 @@ -0,0 +1 @@
-+#define LUSTRE_KERNEL_VERSION 4
++#define LUSTRE_KERNEL_VERSION 5
 --- linux-pristine/./arch/ia64/mm/init.c       Thu Dec  5 10:47:25 2002
 +++ linux/./arch/ia64/mm/init.c        Fri Nov 29 18:06:20 2002
 @@ -44,6 +44,12 @@
@@ -673,7 +673,7 @@
 -              if (inode->i_op->follow_link) {
 -                      err = do_follow_link(dentry, nd);
 +              if (inode->i_op->follow_link || inode->i_op->follow_link2) {
-+                      err = do_follow_link(dentry, nd, it);
++                      err = do_follow_link(dentry, nd, NULL);
                        dput(dentry);
                        if (err)
                                goto return_err;

diff --git a/lustre/kernel_patches/patches/vanilla-2.4.18.patch b/lustre/kernel_patches/patches/vanilla-2.4.18.patch
index ee0bd78..00cc57c 100644 (file)
--- a/lustre/kernel_patches/patches/vanilla-2.4.18.patch
+++ b/lustre/kernel_patches/patches/vanilla-2.4.18.patch
@@ -1,7 +1,7 @@
 --- lum-pristine/include/linux/lustre_version.h        Wed Dec 31 19:00:00 1969
 +++ lum/include/linux/lustre_version.h Tue Nov 26 07:02:14 2002
 @@ -0,0 +1,1 @@
-+#define LUSTRE_KERNEL_VERSION 4
++#define LUSTRE_KERNEL_VERSION 5
 --- lum-pristine/arch/ia64/mm/init.c   Fri Nov  9 17:26:17 2001
 +++ lum/arch/ia64/mm/init.c    Thu Aug  1 18:07:35 2002
 @@ -37,6 +37,12 @@
@@ -671,7 +671,7 @@
 -              if (inode->i_op->follow_link) {
 -                      err = do_follow_link(dentry, nd);
 +              if (inode->i_op->follow_link || inode->i_op->follow_link2) {
-+                      err = do_follow_link(dentry, nd, it);
++                      err = do_follow_link(dentry, nd, NULL);
                        dput(dentry);
                        if (err)
                                goto return_err;

diff --git a/lustre/kernel_patches/patches/vanilla-2.4.19.patch b/lustre/kernel_patches/patches/vanilla-2.4.19.patch
index 1e34ffc..72949cd 100644 (file)
--- a/lustre/kernel_patches/patches/vanilla-2.4.19.patch
+++ b/lustre/kernel_patches/patches/vanilla-2.4.19.patch
@@ -26,7 +26,7 @@
 --- /dev/null  Fri Aug 30 17:31:37 2002
 +++ linux-2.4.19-root/include/linux/lustre_version.h   Sun Dec 15 16:58:43 2002
 @@ -0,0 +1 @@
-+#define LUSTRE_KERNEL_VERSION 4
++#define LUSTRE_KERNEL_VERSION 5
 --- linux-2.4.19/arch/ia64/mm/init.c~vanilla-2.4.19    Sun Dec 15 16:58:43 2002
 +++ linux-2.4.19-root/arch/ia64/mm/init.c      Sun Dec 15 16:58:43 2002
 @@ -37,6 +37,12 @@ unsigned long MAX_DMA_ADDRESS = PAGE_OFF
@@ -695,7 +695,7 @@
 -              if (inode->i_op->follow_link) {
 -                      err = do_follow_link(dentry, nd);
 +              if (inode->i_op->follow_link || inode->i_op->follow_link2) {
-+                      err = do_follow_link(dentry, nd, it);
++                      err = do_follow_link(dentry, nd, NULL);
                        dput(dentry);
                        if (err)
                                goto return_err;

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18.patch
index fe90e85..ba7b7ac 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18.patch
@@ -163,7 +163,7 @@
 -              if (inode->i_op->follow_link) {
 -                      err = do_follow_link(dentry, nd);
 +              if (inode->i_op->follow_link || inode->i_op->follow_link2) {
-+                      err = do_follow_link(dentry, nd, it);
++                      err = do_follow_link(dentry, nd, NULL);
                        dput(dentry);
                        if (err)
                                goto return_err;

diff --git a/lustre/kernel_patches/patches/vfs_intent.patch b/lustre/kernel_patches/patches/vfs_intent.patch
index 4bba678..54c498a 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_intent.patch
+++ b/lustre/kernel_patches/patches/vfs_intent.patch
@@ -158,7 +158,7 @@
 -              if (inode->i_op->follow_link) {
 -                      err = do_follow_link(dentry, nd);
 +              if (inode->i_op->follow_link || inode->i_op->follow_link2) {
-+                      err = do_follow_link(dentry, nd, it);
++                      err = do_follow_link(dentry, nd, NULL);
                        dput(dentry);
                        if (err)
                                goto return_err;