diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-05-09 22:09:14 -0500 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-07-15 10:01:06 +0100 |
| commit | 452452beb88f93d280c6b6540fd434f98930eab6 (patch) | |
| tree | 0eff088325a756013332d781784cf2320bd84a75 /kernel | |
| parent | 8f94859743e838044eab15862d75b35b9e70d688 (diff) | |
sysctl: Allow creating permanently empty directories that serve as mountpoints.
commit f9bd6733d3f11e24f3949becf277507d422ee1eb upstream.
Add a magic sysctl table sysctl_mount_point that when used to
create a directory forces that directory to be permanently empty.
Update the code to use make_empty_dir_inode when accessing permanently
empty directories.
Update the code to not allow adding to permanently empty directories.
Update /proc/sys/fs/binfmt_misc to be a permanently empty directory.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 75b22e22a72c..344788eba906 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1507,12 +1507,6 @@ static struct ctl_table vm_table[] = { { } }; -#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) -static struct ctl_table binfmt_misc_table[] = { - { } -}; -#endif - static struct ctl_table fs_table[] = { { .procname = "inode-nr", @@ -1666,7 +1660,7 @@ static struct ctl_table fs_table[] = { { .procname = "binfmt_misc", .mode = 0555, - .child = binfmt_misc_table, + .child = sysctl_mount_point, }, #endif { |