Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: "Eric W. Biederman" <ebiederm@xmission.com>

+7
+2
fs/ext4/super.c
··· 91 91 .fs_flags = FS_REQUIRES_DEV, 92 92 }; 93 93 MODULE_ALIAS_FS("ext2"); 94 + MODULE_ALIAS("ext2"); 94 95 #define IS_EXT2_SB(sb) ((sb)->s_bdev->bd_holder == &ext2_fs_type) 95 96 #else 96 97 #define IS_EXT2_SB(sb) (0) ··· 107 106 .fs_flags = FS_REQUIRES_DEV, 108 107 }; 109 108 MODULE_ALIAS_FS("ext3"); 109 + MODULE_ALIAS("ext3"); 110 110 #define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type) 111 111 #else 112 112 #define IS_EXT3_SB(sb) (0)
+1
fs/freevxfs/vxfs_super.c
··· 258 258 .fs_flags = FS_REQUIRES_DEV, 259 259 }; 260 260 MODULE_ALIAS_FS("vxfs"); /* makes mount -t vxfs autoload the module */ 261 + MODULE_ALIAS("vxfs"); 261 262 262 263 static int __init 263 264 vxfs_init(void)
+1
fs/isofs/inode.c
··· 1557 1557 .fs_flags = FS_REQUIRES_DEV, 1558 1558 }; 1559 1559 MODULE_ALIAS_FS("iso9660"); 1560 + MODULE_ALIAS("iso9660"); 1560 1561 1561 1562 static int __init init_iso9660_fs(void) 1562 1563 {
+1
fs/nfs/super.c
··· 335 335 .fs_flags = FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA, 336 336 }; 337 337 MODULE_ALIAS_FS("nfs4"); 338 + MODULE_ALIAS("nfs4"); 338 339 EXPORT_SYMBOL_GPL(nfs4_fs_type); 339 340 340 341 static int __init register_nfs4_fs(void)
+1
fs/sysv/super.c
··· 555 555 .fs_flags = FS_REQUIRES_DEV, 556 556 }; 557 557 MODULE_ALIAS_FS("v7"); 558 + MODULE_ALIAS("v7"); 558 559 559 560 static int __init init_sysv_fs(void) 560 561 {
+1
net/sunrpc/rpc_pipe.c
··· 1175 1175 .kill_sb = rpc_kill_sb, 1176 1176 }; 1177 1177 MODULE_ALIAS_FS("rpc_pipefs"); 1178 + MODULE_ALIAS("rpc_pipefs"); 1178 1179 1179 1180 static void 1180 1181 init_once(void *foo)