get rid of kill_litter_super()

Not used anymore.

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

diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst
index 7233b04668fcce75f1ed170329a2cd18110a7d89..4921b3b0662a720d2b1de33d3e631b049da0c8c2 100644 (file)
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@ -1309,3 +1309,10 @@ a different length, use
        vfs_parse_fs_qstr(fc, key, &QSTR_LEN(value, len))
 
 instead.
+
+---
+
+**mandatory**
+
+kill_litter_super() is gone; convert to DCACHE_PERSISTENT use (as all
+in-tree filesystems have done).

diff --git a/fs/dcache.c b/fs/dcache.c
index 3cc6c3876177b25b6ecccd1ceddefc291fccdeec..5ee2e78a91b394e74cbc2625d5205e286bf10bf9 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -3167,27 +3167,6 @@ bool is_subdir(struct dentry *new_dentry, struct dentry *old_dentry)
 }
 EXPORT_SYMBOL(is_subdir);
 
-static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
-{
-       struct dentry *root = data;
-       if (dentry != root) {
-               if (d_unhashed(dentry) || !dentry->d_inode ||
-                   dentry->d_flags & DCACHE_PERSISTENT)
-                       return D_WALK_SKIP;
-
-               if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
-                       dentry->d_flags |= DCACHE_GENOCIDE;
-                       dentry->d_lockref.count--;
-               }
-       }
-       return D_WALK_CONTINUE;
-}
-
-void d_genocide(struct dentry *parent)
-{
-       d_walk(parent, parent, d_genocide_kill);
-}
-
 void d_mark_tmpfile(struct file *file, struct inode *inode)
 {
        struct dentry *dentry = file->f_path.dentry;

diff --git a/fs/internal.h b/fs/internal.h
index 9b2b4d11688023a5210cee8d128c4c77e1b74710..144686af6c368616a3add7d5c07cd64fc21a6549 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -227,7 +227,6 @@ extern void shrink_dcache_for_umount(struct super_block *);
 extern struct dentry *__d_lookup(const struct dentry *, const struct qstr *);
 extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
                                const struct qstr *name, unsigned *seq);
-extern void d_genocide(struct dentry *);
 
 /*
  * pipe.c

diff --git a/fs/super.c b/fs/super.c
index 5bab94fb7e0358a59aeda0c0985d875e4463ade1..ee001f684d2a63a8f3511d1051144e83892a7c2a 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -1284,14 +1284,6 @@ void kill_anon_super(struct super_block *sb)
 }
 EXPORT_SYMBOL(kill_anon_super);
 
-void kill_litter_super(struct super_block *sb)
-{
-       if (sb->s_root)
-               d_genocide(sb->s_root);
-       kill_anon_super(sb);
-}
-EXPORT_SYMBOL(kill_litter_super);
-
 int set_anon_super_fc(struct super_block *sb, struct fs_context *fc)
 {
        return set_anon_super(sb, NULL);

diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 6ec4066825e315d8a4c328503983ba03733299f1..20a85144a00e51dd147ce1d16c71b7cf6af95411 100644 (file)
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -198,7 +198,6 @@ enum dentry_flags {
        DCACHE_REFERENCED               = BIT(6),       /* Recently used, don't discard. */
        DCACHE_DONTCACHE                = BIT(7),       /* Purge from memory on final dput() */
        DCACHE_CANT_MOUNT               = BIT(8),
-       DCACHE_GENOCIDE                 = BIT(9),
        DCACHE_SHRINK_LIST              = BIT(10),
        DCACHE_OP_WEAK_REVALIDATE       = BIT(11),
        /*

diff --git a/include/linux/fs.h b/include/linux/fs.h
index f5037c556f6171c3e441c1b07c74a63ce2d7fb11..95933ceaae51d8829171e8b44db3b6366b698c12 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2728,7 +2728,6 @@ void retire_super(struct super_block *sb);
 void generic_shutdown_super(struct super_block *sb);
 void kill_block_super(struct super_block *sb);
 void kill_anon_super(struct super_block *sb);
-void kill_litter_super(struct super_block *sb);
 void deactivate_super(struct super_block *sb);
 void deactivate_locked_super(struct super_block *sb);
 int set_anon_super(struct super_block *s, void *data);