* update HEAD to b_config

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/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;