revert fix from bug 16417.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c3373c3..d14b042 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -62,14 +62,6 @@ Bugzilla   : 18049
 Descriptoin: aborting recovery hang on MDS
 Details    : don't throttle destroy RPCs for the MDT.
 
-Severity   : normal
-Frequency  : race on file read and write
-Bugzilla   : 16417
-Description: Lustre doesn't delete files
-Details    : Clients drop lock reference and release openhandle when they find
-            stale inode.
-
-
 --------------------------------------------------------------------------
 2009-01-15 Sun Microsystems, Inc.
        * version 1.6.7

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 6e67b57..c0989f2 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -469,15 +469,7 @@ do_lock:
         }
 
         if (rc < 0) {
-                if (-ESTALE == rc) {
-                        if (it_disposition(it, DISP_OPEN_OPEN) &&
-                            !it_open_error(DISP_OPEN_OPEN, it))
-                                /* server have valid open - close file first*/
-                                ll_release_openhandle(de, it);
-                        /* release intent reference to avoid having stale 'it'
-                         * in namedata for old VFS intent */
-                        ll_intent_drop_lock(it);
-                } else {
+                if (rc != -ESTALE) {
                         CDEBUG(D_INFO, "ll_intent_lock: rc %d : it->it_status "
                                "%d\n", rc, it->d.lustre.it_status);
                 }