Commit 128b7d66 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

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

FS_LITTER filesystems (ramfs-like) switched to use of ->kill_sb().
FS_LITTER is gone.
parent dcb1bcb7
...@@ -350,7 +350,7 @@ static struct file_system_type pcihpfs_type = { ...@@ -350,7 +350,7 @@ static struct file_system_type pcihpfs_type = {
owner: THIS_MODULE, owner: THIS_MODULE,
name: "pcihpfs", name: "pcihpfs",
get_sb: pcihpfs_get_sb, get_sb: pcihpfs_get_sb,
fs_flags: FS_LITTER, kill_sb: kill_litter_super,
}; };
static int get_mount (void) static int get_mount (void)
......
...@@ -721,7 +721,7 @@ static struct file_system_type bm_fs_type = { ...@@ -721,7 +721,7 @@ static struct file_system_type bm_fs_type = {
owner: THIS_MODULE, owner: THIS_MODULE,
name: "binfmt_misc", name: "binfmt_misc",
get_sb: bm_get_sb, get_sb: bm_get_sb,
fs_flags: FS_LITTER, kill_sb: kill_litter_super,
}; };
static int __init init_misc_binfmt(void) static int __init init_misc_binfmt(void)
......
...@@ -433,7 +433,7 @@ static struct file_system_type driverfs_fs_type = { ...@@ -433,7 +433,7 @@ static struct file_system_type driverfs_fs_type = {
owner: THIS_MODULE, owner: THIS_MODULE,
name: "driverfs", name: "driverfs",
get_sb: driverfs_get_sb, get_sb: driverfs_get_sb,
fs_flags: FS_LITTER, kill_sb: kill_litter_super,
}; };
static int get_mount(void) static int get_mount(void)
......
...@@ -338,12 +338,13 @@ static struct super_block *ramfs_get_sb(struct file_system_type *fs_type, ...@@ -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 = { static struct file_system_type ramfs_fs_type = {
name: "ramfs", name: "ramfs",
get_sb: ramfs_get_sb, get_sb: ramfs_get_sb,
fs_flags: FS_LITTER, kill_sb: kill_litter_super,
}; };
static struct file_system_type rootfs_fs_type = { static struct file_system_type rootfs_fs_type = {
name: "rootfs", name: "rootfs",
get_sb: ramfs_get_sb, 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) static int __init init_ramfs_fs(void)
......
...@@ -440,9 +440,6 @@ static void shutdown_super(struct super_block *sb) ...@@ -440,9 +440,6 @@ static void shutdown_super(struct super_block *sb)
kdev_t dev = sb->s_dev; kdev_t dev = sb->s_dev;
struct block_device *bdev = sb->s_bdev; 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); generic_shutdown_super(sb);
if (bdev) { if (bdev) {
bd_release(bdev); bd_release(bdev);
......
...@@ -92,7 +92,6 @@ extern int leases_enable, dir_notify_enable, lease_break_time; ...@@ -92,7 +92,6 @@ extern int leases_enable, dir_notify_enable, lease_break_time;
* FS_NO_DCACHE is not set. * FS_NO_DCACHE is not set.
*/ */
#define FS_NOMOUNT 16 /* Never mount from userland */ #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 #define FS_ODD_RENAME 32768 /* Temporary stuff; will go away as soon
* as nfs_rename() will be cleaned up * as nfs_rename() will be cleaned up
*/ */
......
...@@ -1425,20 +1425,21 @@ static struct file_system_type shmem_fs_type = { ...@@ -1425,20 +1425,21 @@ static struct file_system_type shmem_fs_type = {
owner: THIS_MODULE, owner: THIS_MODULE,
name: "shmem", name: "shmem",
get_sb: shmem_get_sb, get_sb: shmem_get_sb,
fs_flags: FS_LITTER, kill_sb: kill_litter_super,
}; };
static struct file_system_type tmpfs_fs_type = { static struct file_system_type tmpfs_fs_type = {
owner: THIS_MODULE, owner: THIS_MODULE,
name: "tmpfs", name: "tmpfs",
get_sb: shmem_get_sb, get_sb: shmem_get_sb,
fs_flags: FS_LITTER, kill_sb: kill_litter_super,
}; };
#else #else
static struct file_system_type tmpfs_fs_type = { static struct file_system_type tmpfs_fs_type = {
owner: THIS_MODULE, owner: THIS_MODULE,
name: "tmpfs", name: "tmpfs",
get_sb: shmem_get_sb, get_sb: shmem_get_sb,
fs_flags: FS_LITTER|FS_NOMOUNT, kill_sb: kill_litter_super,
fs_flags: FS_NOMOUNT,
}; };
#endif #endif
static struct vfsmount *shm_mnt; static struct vfsmount *shm_mnt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment