to_shrink_list(): call only if refcount is 0

The only thing it does if refcount is not zero is d_lru_del(); no
point, IMO, seeing that plain dput() does nothing of that sort...

Note that 2 of 3 current callers are guaranteed that refcount is 0.

Acked-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/dcache.c b/fs/dcache.c
index 5284b02747cd9eee0ba822dd2cabca5ff6e4d07d..704676bf06fd5d154e6e673a2686f4c2d95c7a18 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -915,8 +915,7 @@ __must_hold(&dentry->d_lock)
        if (!(dentry->d_flags & DCACHE_SHRINK_LIST)) {
                if (dentry->d_flags & DCACHE_LRU_LIST)
                        d_lru_del(dentry);
-               if (!dentry->d_lockref.count)
-                       d_shrink_add(dentry, list);
+               d_shrink_add(dentry, list);
        }
 }
 
@@ -1115,10 +1114,8 @@ EXPORT_SYMBOL(d_prune_aliases);
 static inline void shrink_kill(struct dentry *victim, struct list_head *list)
 {
        struct dentry *parent = victim->d_parent;
-       if (parent != victim) {
-               --parent->d_lockref.count;
+       if (parent != victim && !--parent->d_lockref.count)
                to_shrink_list(parent, list);
-       }
        __dentry_kill(victim);
 }