History

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

Linus Torvalds committed 13 years ago

Commit 72932612 parents 8343bce db04dc671 files · +84 −19Browse files

Showing the changes to include/linux (1 of 71 files). Show all

Unified · Split

include/linux/fs.h+2−0
@@ -1825,6 +1825,8 @@ struct file_system_type { · 1824 unmodified lines
18251825 struct lock_class_key i_mutex_dir_key;
18261826 };
18271827
1828+#define MODULE_ALIAS_FS(NAME) MODULE_ALIAS("fs-" NAME)
1829+
18281830 extern struct dentry *mount_ns(struct file_system_type *fs_type, int flags,
18291831 void *data, int (*fill_super)(struct super_block *, void *, int));
18301832 extern struct dentry *mount_bdev(struct file_system_type *fs_type,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t