expand the call of dentry_lru_del() in dentry_kill()

commit 01b6035190b024240a43ac1d8e9c6f964f5f1c63 upstream.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>

diff --git a/fs/dcache.c b/fs/dcache.c
index 362aa79c90b3caee0542456749ccb874ed11d3b4..2bb4e4f1ca6db20995171ee97e6af98fdc7cd7aa 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -523,7 +523,12 @@ relock:
        if ((dentry->d_flags & DCACHE_OP_PRUNE) && !d_unhashed(dentry))
                dentry->d_op->d_prune(dentry);
 
-       dentry_lru_del(dentry);
+       if (dentry->d_flags & DCACHE_LRU_LIST) {
+               if (!(dentry->d_flags & DCACHE_SHRINK_LIST))
+                       d_lru_del(dentry);
+               else
+                       d_shrink_del(dentry);
+       }
        /* if it was on the hash then remove it */
        __d_drop(dentry);
        list_del(&dentry->d_u.d_child);