ARM: configs: sama5_defconfig: update and remove unneeded options

[linux-2.6-block.git] / fs / dcache.c

diff --git a/fs/dcache.c b/fs/dcache.c
index ea0485861d9377311a858359ab1183a1bae4e042..97e81a844a966c6683e4688347f78149f886e16f 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -793,10 +793,17 @@ static inline bool fast_dput(struct dentry *dentry)
         * a reference to the dentry and change that, but
         * our work is done - we can leave the dentry
         * around with a zero refcount.
+        *
+        * Nevertheless, there are two cases that we should kill
+        * the dentry anyway.
+        * 1. free disconnected dentries as soon as their refcount
+        *    reached zero.
+        * 2. free dentries if they should not be cached.
         */
        smp_rmb();
        d_flags = READ_ONCE(dentry->d_flags);
-       d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST | DCACHE_DISCONNECTED;
+       d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST |
+                       DCACHE_DISCONNECTED | DCACHE_DONTCACHE;
 
        /* Nothing to do? Dropping the reference was all we needed? */
        if (d_flags == (DCACHE_REFERENCED | DCACHE_LRU_LIST) && !d_unhashed(dentry))