Merge of b_md to HEAD:

[fs/lustre-release.git] / lustre / patches / patch-2.4.18-14

diff --git a/lustre/patches/patch-2.4.18-14 b/lustre/patches/patch-2.4.18-14
index 22029f1..e563f7b 100644 (file)
--- a/lustre/patches/patch-2.4.18-14
+++ b/lustre/patches/patch-2.4.18-14
@@ -1,7 +1,7 @@
 --- linux-2.4.18-17.8.0-uml-pristine/include/linux/lustre_version.h    Wed Dec 31 19:00:00 1969
-+++ linux-2.4.18-17.8.0-uml/include/linux/lustre_version.h     Wed Nov  6 02:34:14 2002
++++ linux-2.4.18-17.8.0-uml/include/linux/lustre_version.h     Tue Nov 26 07:02:14 2002
 @@ -0,0 +1 @@
-+#define LUSTRE_KERNEL_VERSION 2
++#define LUSTRE_KERNEL_VERSION 3
 --- linux-2.4.18-17.8.0-uml-pristine/arch/ia64/mm/init.c       2002-10-19 11:44:08.000000000 -0600
 +++ linux-2.4.18-17.8.0-uml/arch/ia64/mm/init.c        2002-10-19 11:44:51.000000000 -0600
 @@ -37,6 +37,12 @@
@@ -330,7 +330,7 @@
 +{
 +      if (de->d_op && de->d_op->d_intent_release)
 +              de->d_op->d_intent_release(de, it);
-+      de->d_it = NULL;
++
 +}
 +
 +
@@ -702,7 +702,7 @@
        dir = nd->dentry;
        down(&dir->d_inode->i_sem);
 -      dentry = lookup_hash(&nd->last, nd->dentry);
-+      dentry = lookup_hash_it(&nd->last, nd->dentry, NULL);
++      dentry = lookup_hash_it(&nd->last, nd->dentry, it);
        putname(nd->last.name);
        goto do_last;
  }