revert fix from bug 16417

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 6c0b31b..b8a9007 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -41,13 +41,6 @@ Description: external journal device not working after the remount
 Details    : clear dev_rdonly flag for external journal devices in
              blkdev_put()
 
-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.
-
 Severity   : minor
 Frequency  : rare
 Bugzilla   : 17802

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