diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-09 16:51:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-09 16:51:13 -0800 |
| commit | 72932611b4b05bbd89fafa369d564ac8e449809b (patch) | |
| tree | 10c55c8fef383cf72059f796b82a36efae058384 /fs/btrfs | |
| parent | 8343bce195da8bb4d5a652ee085474a5cc62983f (diff) | |
| parent | db04dc679bcc780ad6907943afe24a30de974a1b (diff) | |
| download | linux-3.10-72932611b4b05bbd89fafa369d564ac8e449809b.tar.gz linux-3.10-72932611b4b05bbd89fafa369d564ac8e449809b.tar.bz2 linux-3.10-72932611b4b05bbd89fafa369d564ac8e449809b.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace bugfixes from Eric Biederman:
"This is three simple fixes against 3.9-rc1. I have tested each of
these fixes and verified they work correctly.
The userns oops in key_change_session_keyring and the BUG_ON triggered
by proc_ns_follow_link were found by Dave Jones.
I am including the enhancement for mount to only trigger requests of
filesystem modules here instead of delaying this for the 3.10 merge
window because it is both trivial and the kind of change that tends to
bit-rot if left untouched for two months."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
proc: Use nd_jump_link in proc_ns_follow_link
fs: Limit sys_mount to only request filesystem modules (Part 2).
fs: Limit sys_mount to only request filesystem modules.
userns: Stop oopsing in key_change_session_keyring
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 68a29a1ea06..f6b88595f85 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1558,6 +1558,7 @@ static struct file_system_type btrfs_fs_type = { .kill_sb = btrfs_kill_super, .fs_flags = FS_REQUIRES_DEV, }; +MODULE_ALIAS_FS("btrfs"); /* * used by btrfsctl to scan devices when no FS is mounted |