projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
proc
/
root.c
diff --git
a/fs/proc/root.c
b/fs/proc/root.c
index 74c2c6ab10bdc6613c0c8b6d79fd8a6e39bbd8cf..33f72d1b92cca60ef9f187ac7ccfbc873c0bf7e1 100644
(file)
--- a/
fs/proc/root.c
+++ b/
fs/proc/root.c
@@
-210,7
+210,7
@@
static struct file_system_type proc_fs_type = {
.init_fs_context = proc_init_fs_context,
.parameters = &proc_fs_parameters,
.kill_sb = proc_kill_sb,
- .fs_flags = FS_USERNS_MOUNT,
+ .fs_flags = FS_USERNS_MOUNT
| FS_DISALLOW_NOTIFY_PERM
,
};
void __init proc_root_init(void)