aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r--fs/ext4/super.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 12e726a7073f..312211ee05af 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3966,27 +3966,6 @@ static struct file_system_type ext4_fs_type = {
3966 .fs_flags = FS_REQUIRES_DEV, 3966 .fs_flags = FS_REQUIRES_DEV,
3967}; 3967};
3968 3968
3969#ifdef CONFIG_EXT4DEV_COMPAT
3970static int ext4dev_get_sb(struct file_system_type *fs_type, int flags,
3971 const char *dev_name, void *data,struct vfsmount *mnt)
3972{
3973 printk(KERN_WARNING "EXT4-fs (%s): Update your userspace programs "
3974 "to mount using ext4\n", dev_name);
3975 printk(KERN_WARNING "EXT4-fs (%s): ext4dev backwards compatibility "
3976 "will go away by 2.6.31\n", dev_name);
3977 return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt);
3978}
3979
3980static struct file_system_type ext4dev_fs_type = {
3981 .owner = THIS_MODULE,
3982 .name = "ext4dev",
3983 .get_sb = ext4dev_get_sb,
3984 .kill_sb = kill_block_super,
3985 .fs_flags = FS_REQUIRES_DEV,
3986};
3987MODULE_ALIAS("ext4dev");
3988#endif
3989
3990static int __init init_ext4_fs(void) 3969static int __init init_ext4_fs(void)
3991{ 3970{
3992 int err; 3971 int err;
@@ -4011,13 +3990,6 @@ static int __init init_ext4_fs(void)
4011 err = register_filesystem(&ext4_fs_type); 3990 err = register_filesystem(&ext4_fs_type);
4012 if (err) 3991 if (err)
4013 goto out; 3992 goto out;
4014#ifdef CONFIG_EXT4DEV_COMPAT
4015 err = register_filesystem(&ext4dev_fs_type);
4016 if (err) {
4017 unregister_filesystem(&ext4_fs_type);
4018 goto out;
4019 }
4020#endif
4021 return 0; 3993 return 0;
4022out: 3994out:
4023 destroy_inodecache(); 3995 destroy_inodecache();
@@ -4036,9 +4008,6 @@ out4:
4036static void __exit exit_ext4_fs(void) 4008static void __exit exit_ext4_fs(void)
4037{ 4009{
4038 unregister_filesystem(&ext4_fs_type); 4010 unregister_filesystem(&ext4_fs_type);
4039#ifdef CONFIG_EXT4DEV_COMPAT
4040 unregister_filesystem(&ext4dev_fs_type);
4041#endif
4042 destroy_inodecache(); 4011 destroy_inodecache();
4043 exit_ext4_xattr(); 4012 exit_ext4_xattr();
4044 exit_ext4_mballoc(); 4013 exit_ext4_mballoc();