[PATCH] (2/4) ->kill_sb() switchover

FS_LITTER filesystems (ramfs-like) switched to use of ->kill_sb().
FS_LITTER is gone.

diff --git a/drivers/hotplug/pci_hotplug_core.c b/drivers/hotplug/pci_hotplug_core.c
index f4d7d1e488e056221c5eb8922af60715253351bd..f7b9b553b91978f07453e142d7179a3255c2049a 100644 (file)
--- a/drivers/hotplug/pci_hotplug_core.c
+++ b/drivers/hotplug/pci_hotplug_core.c
@@ -350,7 +350,7 @@ static struct file_system_type pcihpfs_type = {
        owner:          THIS_MODULE,
        name:           "pcihpfs",
        get_sb:         pcihpfs_get_sb,
-       fs_flags:       FS_LITTER,
+       kill_sb:        kill_litter_super,
 };
 
 static int get_mount (void)

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 1eefc979db62cec4baf0d5a250037a116664279f..416d4270b06e3bf1530d621f7867e27676bb7c2a 100644 (file)
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -721,7 +721,7 @@ static struct file_system_type bm_fs_type = {
        owner:          THIS_MODULE,
        name:           "binfmt_misc",
        get_sb:         bm_get_sb,
-       fs_flags:       FS_LITTER,
+       kill_sb:        kill_litter_super,
 };
 
 static int __init init_misc_binfmt(void)

diff --git a/fs/driverfs/inode.c b/fs/driverfs/inode.c
index 825803fda0829ca33c9912b37a05db0ee115f961..2d30b322743f87c6ed30383559d6110de4c0c47e 100644 (file)
--- a/fs/driverfs/inode.c
+++ b/fs/driverfs/inode.c
@@ -433,7 +433,7 @@ static struct file_system_type driverfs_fs_type = {
        owner:          THIS_MODULE,
        name:           "driverfs",
        get_sb:         driverfs_get_sb,
-       fs_flags:       FS_LITTER,
+       kill_sb:        kill_litter_super,
 };
 
 static int get_mount(void)

diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index 095d2fd374b554defdeef2825031a2619270e17c..f146b857a1135a140bc9de2945d5550e1e31499c 100644 (file)
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -338,12 +338,13 @@ static struct super_block *ramfs_get_sb(struct file_system_type *fs_type,
 static struct file_system_type ramfs_fs_type = {
        name:           "ramfs",
        get_sb:         ramfs_get_sb,
-       fs_flags:       FS_LITTER,
+       kill_sb:        kill_litter_super,
 };
 static struct file_system_type rootfs_fs_type = {
        name:           "rootfs",
        get_sb:         ramfs_get_sb,
-       fs_flags:       FS_NOMOUNT|FS_LITTER,
+       kill_sb:        kill_litter_super,
+       fs_flags:       FS_NOMOUNT,
 };
 
 static int __init init_ramfs_fs(void)

diff --git a/fs/super.c b/fs/super.c
index e70ad866d42d93f9dfcda340e0fb1e4dd9c7e604..bc2ed690674d1636d8e336d8f554998dd96e3a1f 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -440,9 +440,6 @@ static void shutdown_super(struct super_block *sb)
        kdev_t dev = sb->s_dev;
        struct block_device *bdev = sb->s_bdev;
 
-       /* Need to clean after the sucker */
-       if (fs->fs_flags & FS_LITTER && sb->s_root)
-               d_genocide(sb->s_root);
        generic_shutdown_super(sb);
        if (bdev) {
                bd_release(bdev);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index a98513fc754f04187c9b36c792241443da16bc0b..605355cdbdde28c1ecf1337624653fe5f9f4b364 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -92,7 +92,6 @@ extern int leases_enable, dir_notify_enable, lease_break_time;
                           * FS_NO_DCACHE is not set.
                           */
 #define FS_NOMOUNT     16 /* Never mount from userland */
-#define FS_LITTER      32 /* Keeps the tree in dcache */
 #define FS_ODD_RENAME  32768   /* Temporary stuff; will go away as soon
                                  * as nfs_rename() will be cleaned up
                                  */

diff --git a/mm/shmem.c b/mm/shmem.c
index a1a2bdbc0401fd1c947fdbf7659b80a846d8e02b..1242ec030eb42c3e934248857988a3d3422709c7 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1425,20 +1425,21 @@ static struct file_system_type shmem_fs_type = {
        owner:          THIS_MODULE,
        name:           "shmem",
        get_sb:         shmem_get_sb,
-       fs_flags:       FS_LITTER,
+       kill_sb:        kill_litter_super,
 };
 static struct file_system_type tmpfs_fs_type = {
        owner:          THIS_MODULE,
        name:           "tmpfs",
        get_sb:         shmem_get_sb,
-       fs_flags:       FS_LITTER,
+       kill_sb:        kill_litter_super,
 };
 #else
 static struct file_system_type tmpfs_fs_type = {
        owner:          THIS_MODULE,
        name:           "tmpfs",
        get_sb:         shmem_get_sb,
-       fs_flags:       FS_LITTER|FS_NOMOUNT,
+       kill_sb:        kill_litter_super,
+       fs_flags:       FS_NOMOUNT,
 };
 #endif
 static struct vfsmount *shm_mnt;