revert patch from bug 16417

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 59b0666..56f4a3f 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -56,14 +56,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.
-
-
 -------------------------------------------------------------------------------
 2008-12-31 Sun Microsystems, Inc.
        * version 1.8.0

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index d4ad3f2..fed9019 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -470,15 +470,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);
                 }

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index cee8fd7..e331b21 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -54,7 +54,7 @@
 #include <lustre_net.h>
 #include <lustre/ll_fiemap.h>
 
-#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(1,8,0,0)
+#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(1,8,99,0)
 #error "lustre_msg_v1 has been deprecated since 1.6.0, please remove it"
 #endif