Skip to contentSkip to conversation

ext4: drop ext4dev compat

PATCH New Eric Sandeen 1 participant 1 message Sep 21, 2009 ext4 file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext4: drop ext4dev compat

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

---

fs/ext4/Kconfig +0 -0
index d5c0ea2..9f2d45d 100644
@@ -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 -0
index a6b1ab7..f20c2d1 100644
@@ -3951,27 +3951,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;
@@ -3996,13 +3975,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();
@@ -4021,9 +3993,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();