Whamcloud - gitweb
Revert "b=19933 control DCACHE_LUSTRE_INVALID flag with MDS_INODELOCK_LOOKUP lock"
authorJohann Lombardi <johann@sun.com>
Wed, 28 Apr 2010 14:49:25 +0000 (16:49 +0200)
committerJohann Lombardi <johann@sun.com>
Wed, 28 Apr 2010 14:49:25 +0000 (16:49 +0200)
Revert 19933 to check if this is the root cause of 22709, hit during hyperion
testing.

This reverts commit 8e87a9da36a81f0e3a6d98120c078d27e17d657c.

lustre/llite/dcache.c

index add4dd6..8991242 100644 (file)
@@ -369,6 +369,9 @@ int ll_revalidate_it(struct dentry *de, int lookup_flags,
                 GOTO(out_sa, rc);
         }
 
+        if ((de->d_flags & DCACHE_LUSTRE_INVALID) == 0)
+                GOTO(out_sa, rc = 1);
+
         exp = ll_i2mdcexp(de->d_inode);
 
         /* Never execute intents for mount points.
@@ -388,9 +391,6 @@ int ll_revalidate_it(struct dentry *de, int lookup_flags,
         ll_frob_intent(&it, &lookup_it);
         LASSERT(it);
 
-        if (it->it_op == IT_LOOKUP && !(de->d_flags & DCACHE_LUSTRE_INVALID))
-                GOTO(out_sa, rc = 1);
-
         ll_prepare_mdc_op_data(&op_data, parent, de->d_inode,
                                de->d_name.name, de->d_name.len, 0, NULL);