Commit aea8b5d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace 

Pull namespace bugfixes from Eric Biederman:
 "This tree includes a partial revert for "fs: Limit sys_mount to only
  request filesystem modules." When I added the new style module aliases
  to the filesystems I deleted the old ones.  A bad move.  It turns out
  that distributions like Arch linux use module aliases when
  constructing ramdisks.  Which meant ultimately that an ext3 filesystem
  mounted with ext4 would not result in the ext4 module being put into
  the ramdisk.

  The other change in this tree adds a handful of filesystem module
  alias I simply failed to add the first time.  Which inconvinienced a
  few folks using cifs.

  I don't want to inconvinience folks any longer than I have to so here
  are these trivial fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  fs: Readd the fs module aliases.
  fs: Limit sys_mount to only request filesystem modules. (Part 3)
parents 842d223f fa7614dd

fs/cifs/cifsfs.c

+1 −0
Original line number Diff line number Diff line
@@ -777,6 +777,7 @@ struct file_system_type cifs_fs_type = { 
	.kill_sb = cifs_kill_sb,

	/*  .fs_flags */

};

MODULE_ALIAS_FS("cifs");

const struct inode_operations cifs_dir_inode_ops = {

	.create = cifs_create,

	.atomic_open = cifs_atomic_open,

fs/ext4/super.c

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ static struct file_system_type ext2_fs_type = { 
	.fs_flags	= FS_REQUIRES_DEV,

};

MODULE_ALIAS_FS("ext2");

MODULE_ALIAS("ext2");

#define IS_EXT2_SB(sb) ((sb)->s_bdev->bd_holder == &ext2_fs_type)

#else

#define IS_EXT2_SB(sb) (0)
@@ -106,6 +107,7 @@ static struct file_system_type ext3_fs_type = { 
	.fs_flags	= FS_REQUIRES_DEV,

};

MODULE_ALIAS_FS("ext3");

MODULE_ALIAS("ext3");

#define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type)

#else

#define IS_EXT3_SB(sb) (0)

fs/freevxfs/vxfs_super.c

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ static struct file_system_type vxfs_fs_type = { 
	.fs_flags	= FS_REQUIRES_DEV,

};

MODULE_ALIAS_FS("vxfs"); /* makes mount -t vxfs autoload the module */

MODULE_ALIAS("vxfs");



static int __init

vxfs_init(void)

fs/hostfs/hostfs_kern.c

+1 −0
Original line number Diff line number Diff line
@@ -986,6 +986,7 @@ static struct file_system_type hostfs_type = { 
	.kill_sb	= hostfs_kill_sb,

	.fs_flags 	= 0,

};

MODULE_ALIAS_FS("hostfs");



static int __init init_hostfs(void)

{

fs/hpfs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -688,6 +688,7 @@ static struct file_system_type hpfs_fs_type = { 
	.kill_sb	= kill_block_super,

	.fs_flags	= FS_REQUIRES_DEV,

};

MODULE_ALIAS_FS("hpfs");



static int __init init_hpfs_fs(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE