Commit f0e2dfa7 authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o
Browse files

ext4: drop ext4dev compat 



Kconfig & super.c promised it'd be gone by 2.6.31, so it's
about time to drop it.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 1f94533d

fs/ext4/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -26,20 +26,6 @@ config EXT4_FS 


	  If unsure, say N.



config EXT4DEV_COMPAT

	bool "Enable ext4dev compatibility"

	depends on EXT4_FS

	help

	  Starting with 2.6.28, the name of the ext4 filesystem was

	  renamed from ext4dev to ext4.  Unfortunately there are some

	  legacy userspace programs (such as klibc's fstype) have

	  "ext4dev" hardcoded.



	  To enable backwards compatibility so that systems that are

	  still expecting to mount ext4 filesystems using ext4dev,

	  choose Y here.   This feature will go away by 2.6.31, so

	  please arrange to get your userspace programs fixed!



config EXT4_FS_XATTR

	bool "Ext4 extended attributes"

	depends on EXT4_FS

fs/ext4/super.c

+0 −31
Original line number Diff line number Diff line
@@ -3966,27 +3966,6 @@ static struct file_system_type ext4_fs_type = { 
	.fs_flags	= FS_REQUIRES_DEV,

};



#ifdef CONFIG_EXT4DEV_COMPAT

static int ext4dev_get_sb(struct file_system_type *fs_type, int flags,

			  const char *dev_name, void *data,struct vfsmount *mnt)

{

	printk(KERN_WARNING "EXT4-fs (%s): Update your userspace programs "

	       "to mount using ext4\n", dev_name);

	printk(KERN_WARNING "EXT4-fs (%s): ext4dev backwards compatibility "

	       "will go away by 2.6.31\n", dev_name);

	return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt);

}



static struct file_system_type ext4dev_fs_type = {

	.owner		= THIS_MODULE,

	.name		= "ext4dev",

	.get_sb		= ext4dev_get_sb,

	.kill_sb	= kill_block_super,

	.fs_flags	= FS_REQUIRES_DEV,

};

MODULE_ALIAS("ext4dev");

#endif



static int __init init_ext4_fs(void)

{

	int err;
@@ -4011,13 +3990,6 @@ static int __init init_ext4_fs(void) 
	err = register_filesystem(&ext4_fs_type);

	if (err)

		goto out;

#ifdef CONFIG_EXT4DEV_COMPAT

	err = register_filesystem(&ext4dev_fs_type);

	if (err) {

		unregister_filesystem(&ext4_fs_type);

		goto out;

	}

#endif

	return 0;

out:

	destroy_inodecache();
@@ -4036,9 +4008,6 @@ out4: 
static void __exit exit_ext4_fs(void)

{

	unregister_filesystem(&ext4_fs_type);

#ifdef CONFIG_EXT4DEV_COMPAT

	unregister_filesystem(&ext4dev_fs_type);

#endif

	destroy_inodecache();

	exit_ext4_xattr();

	exit_ext4_mballoc();