Commit fa7614dd authored by Eric W. Biederman's avatar Eric W. Biederman

fs: Readd the fs module aliases.

I had assumed that the only use of module aliases for filesystems
prior to "fs: Limit sys_mount to only request filesystem modules."
was in request_module.  It turns out I was wrong.  At least mkinitcpio
in Arch linux uses these aliases.

So readd the preexising aliases, to keep from breaking userspace.

Userspace eventually will have to follow and use the same aliases the
kernel does.  So at some point we may be delete these aliases without
problems.  However that day is not today.
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 3e64fe5b
...@@ -91,6 +91,7 @@ static struct file_system_type ext2_fs_type = { ...@@ -91,6 +91,7 @@ static struct file_system_type ext2_fs_type = {
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("ext2"); MODULE_ALIAS_FS("ext2");
MODULE_ALIAS("ext2");
#define IS_EXT2_SB(sb) ((sb)->s_bdev->bd_holder == &ext2_fs_type) #define IS_EXT2_SB(sb) ((sb)->s_bdev->bd_holder == &ext2_fs_type)
#else #else
#define IS_EXT2_SB(sb) (0) #define IS_EXT2_SB(sb) (0)
...@@ -106,6 +107,7 @@ static struct file_system_type ext3_fs_type = { ...@@ -106,6 +107,7 @@ static struct file_system_type ext3_fs_type = {
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("ext3"); MODULE_ALIAS_FS("ext3");
MODULE_ALIAS("ext3");
#define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type) #define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type)
#else #else
#define IS_EXT3_SB(sb) (0) #define IS_EXT3_SB(sb) (0)
......
...@@ -258,6 +258,7 @@ static struct file_system_type vxfs_fs_type = { ...@@ -258,6 +258,7 @@ static struct file_system_type vxfs_fs_type = {
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("vxfs"); /* makes mount -t vxfs autoload the module */ MODULE_ALIAS_FS("vxfs"); /* makes mount -t vxfs autoload the module */
MODULE_ALIAS("vxfs");
static int __init static int __init
vxfs_init(void) vxfs_init(void)
......
...@@ -1557,6 +1557,7 @@ static struct file_system_type iso9660_fs_type = { ...@@ -1557,6 +1557,7 @@ static struct file_system_type iso9660_fs_type = {
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("iso9660"); MODULE_ALIAS_FS("iso9660");
MODULE_ALIAS("iso9660");
static int __init init_iso9660_fs(void) static int __init init_iso9660_fs(void)
{ {
......
...@@ -335,6 +335,7 @@ struct file_system_type nfs4_fs_type = { ...@@ -335,6 +335,7 @@ struct file_system_type nfs4_fs_type = {
.fs_flags = FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA, .fs_flags = FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA,
}; };
MODULE_ALIAS_FS("nfs4"); MODULE_ALIAS_FS("nfs4");
MODULE_ALIAS("nfs4");
EXPORT_SYMBOL_GPL(nfs4_fs_type); EXPORT_SYMBOL_GPL(nfs4_fs_type);
static int __init register_nfs4_fs(void) static int __init register_nfs4_fs(void)
......
...@@ -555,6 +555,7 @@ static struct file_system_type v7_fs_type = { ...@@ -555,6 +555,7 @@ static struct file_system_type v7_fs_type = {
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("v7"); MODULE_ALIAS_FS("v7");
MODULE_ALIAS("v7");
static int __init init_sysv_fs(void) static int __init init_sysv_fs(void)
{ {
......
...@@ -1175,6 +1175,7 @@ static struct file_system_type rpc_pipe_fs_type = { ...@@ -1175,6 +1175,7 @@ static struct file_system_type rpc_pipe_fs_type = {
.kill_sb = rpc_kill_sb, .kill_sb = rpc_kill_sb,
}; };
MODULE_ALIAS_FS("rpc_pipefs"); MODULE_ALIAS_FS("rpc_pipefs");
MODULE_ALIAS("rpc_pipefs");
static void static void
init_once(void *foo) init_once(void *foo)
......
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