namei.c: fold the check for DCACHE_OP_REVALIDATE into d_revalidate()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 14 insertions, 22 deletions

diff --git a/fs/namei.c b/fs/namei.c
index dfe6e32aeec6..2ed2701a74b5 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -751,7 +751,10 @@ drop_root_mnt:
 
 static inline int d_revalidate(struct dentry *dentry, unsigned int flags)
 {
-        return dentry->d_op->d_revalidate(dentry, flags);
+        if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE))
+                return dentry->d_op->d_revalidate(dentry, flags);
+        else
+                return 1;
 }
 
 /**
@@ -1454,19 +1457,14 @@ static struct dentry *lookup_dcache(const struct qstr *name,
                                     struct dentry *dir,
                                     unsigned int flags)
 {
-        struct dentry *dentry;
-        int error;
-
-        dentry = d_lookup(dir, name);
+        struct dentry *dentry = d_lookup(dir, name);
         if (dentry) {
-                if (dentry->d_flags & DCACHE_OP_REVALIDATE) {
-                        error = d_revalidate(dentry, flags);
-                        if (unlikely(error <= 0)) {
-                                if (!error)
-                                        d_invalidate(dentry);
-                                dput(dentry);
-                                return ERR_PTR(error);
-                        }
+                int error = d_revalidate(dentry, flags);
+                if (unlikely(error <= 0)) {
+                        if (!error)
+                                d_invalidate(dentry);
+                        dput(dentry);
+                        return ERR_PTR(error);
                 }
         }
         return dentry;
@@ -1556,8 +1554,7 @@ static int lookup_fast(struct nameidata *nd,
                         return -ECHILD;
 
                 *seqp = seq;
-                if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE))
-                        status = d_revalidate(dentry, nd->flags);
+                status = d_revalidate(dentry, nd->flags);
                 if (likely(status > 0)) {
                         /*
                          * Note: do negative dentry check after revalidation in
@@ -1579,8 +1576,7 @@ static int lookup_fast(struct nameidata *nd,
                 dentry = __d_lookup(parent, &nd->last);
                 if (unlikely(!dentry))
                         return 0;
-                if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE))
-                        status = d_revalidate(dentry, nd->flags);
+                status = d_revalidate(dentry, nd->flags);
         }
         if (unlikely(status <= 0)) {
                 if (!status)
@@ -1619,8 +1615,7 @@ again:
         if (IS_ERR(dentry))
                 goto out;
         if (unlikely(!d_in_lookup(dentry))) {
-                if ((dentry->d_flags & DCACHE_OP_REVALIDATE) &&
-                    !(flags & LOOKUP_NO_REVAL)) {
+                if (!(flags & LOOKUP_NO_REVAL)) {
                         int error = d_revalidate(dentry, flags);
                         if (unlikely(error <= 0)) {
                                 if (!error) {
@@ -3057,9 +3052,6 @@ static int lookup_open(struct nameidata *nd, struct path *path,
                 if (d_in_lookup(dentry))
                         break;
 
-                if (!(dentry->d_flags & DCACHE_OP_REVALIDATE))
-                        break;
-
                 error = d_revalidate(dentry, nd->flags);
                 if (likely(error > 0))
                         break;