- clear dentry->d_it in intent_release

- new patches to fix open() crash

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 923f87b..bbdd884 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -35,6 +35,7 @@ void ll_intent_release(struct dentry *de)
         CDEBUG(D_INFO, "calling ldlm_lock_decref(%p, %d)\n", lock,
                de->d_it->it_lock_mode);
         ldlm_lock_decref(lock, de->d_it->it_lock_mode);
+        de->d_it = NULL;
         EXIT;
 }
 

diff --git a/lustre/patches/intent-lock.patch b/lustre/patches/intent-lock.patch
index 95dfbfe..bfed553 100644 (file)
--- a/lustre/patches/intent-lock.patch
+++ b/lustre/patches/intent-lock.patch
@@ -109,6 +109,16 @@
  
  extern void iput(struct inode *);
  extern void force_delete(struct inode *);
+--- lum-pristine/fs/dcache.c   Mon Feb 25 14:38:08 2002
++++ lum/fs/dcache.c    Fri Jun 14 14:03:03 2002
+@@ -617,6 +617,7 @@
+       dentry->d_op = NULL;
+       dentry->d_fsdata = NULL;
+       dentry->d_mounted = 0;
++        dentry->d_it = NULL;
+       INIT_LIST_HEAD(&dentry->d_hash);
+       INIT_LIST_HEAD(&dentry->d_lru);
+       INIT_LIST_HEAD(&dentry->d_subdirs);
 --- lum-pristine/fs/namei.c    Mon Feb 25 14:38:09 2002
 +++ lum/fs/namei.c     Fri Jun 14 13:49:06 2002
 @@ -94,6 +94,14 @@

diff --git a/lustre/patches/patch-2.4.18 b/lustre/patches/patch-2.4.18
index 6c258a5..6cc693f 100644 (file)
--- a/lustre/patches/patch-2.4.18
+++ b/lustre/patches/patch-2.4.18
@@ -451,6 +451,16 @@
  
  extern void iput(struct inode *);
  extern void force_delete(struct inode *);
+--- lum-pristine/fs/dcache.c   Mon Feb 25 14:38:08 2002
++++ lum/fs/dcache.c    Fri Jun 14 14:03:03 2002
+@@ -617,6 +617,7 @@
+       dentry->d_op = NULL;
+       dentry->d_fsdata = NULL;
+       dentry->d_mounted = 0;
++        dentry->d_it = NULL;
+       INIT_LIST_HEAD(&dentry->d_hash);
+       INIT_LIST_HEAD(&dentry->d_lru);
+       INIT_LIST_HEAD(&dentry->d_subdirs);
 --- lum-pristine/fs/namei.c    Mon Feb 25 14:38:09 2002
 +++ lum/fs/namei.c     Fri Jun 14 13:49:06 2002
 @@ -94,6 +94,14 @@