get rid of DCACHE_GENOCIDE

... now that we never call d_genocide() other than from kill_litter_super()

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

diff --git a/fs/dcache.c b/fs/dcache.c
index 5947556b6e90c0ba57a009480e4404a83578d566..8473c8f0ce229cbaf4ffe569d18fb0040fbd6434 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -3198,10 +3198,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
                if (d_unhashed(dentry) || !dentry->d_inode)
                        return D_WALK_SKIP;
 
-               if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
-                       dentry->d_flags |= DCACHE_GENOCIDE;
-                       dentry->d_lockref.count--;
-               }
+               dentry->d_lockref.count--;
        }
        return D_WALK_CONTINUE;
 }

diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index b4324d47f249a8a2a5ebbb99a4d046b63f0f4aed..981f529c6cb55dfa8f1fefe95fd8577f8917b276 100644 (file)
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -173,7 +173,6 @@ struct dentry_operations {
 #define DCACHE_DONTCACHE               BIT(7) /* Purge from memory on final dput() */
 
 #define DCACHE_CANT_MOUNT              BIT(8)
-#define DCACHE_GENOCIDE                        BIT(9)
 #define DCACHE_SHRINK_LIST             BIT(10)
 
 #define DCACHE_OP_WEAK_REVALIDATE      BIT(11)