diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-05 11:08:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-05 11:08:43 -0700 |
| commit | e579dde654fc2c6b0d3e4b77a9a4b2d2405c510e (patch) | |
| tree | fe507a2904fb302e964831a5ed079cb58ee44c37 /fs/proc | |
| parent | af82455f7dbd9dc20244d80d033721b30d22c065 (diff) | |
| parent | d66bb1607e2d8d384e53f3d93db5c18483c8c4f7 (diff) | |
| download | op-kernel-dev-e579dde654fc2c6b0d3e4b77a9a4b2d2405c510e.zip op-kernel-dev-e579dde654fc2c6b0d3e4b77a9a4b2d2405c510e.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace updates from Eric Biederman:
"This is a set of small fixes that were mostly stumbled over during
more significant development. This proc fix and the fix to
posix-timers are the most significant of the lot.
There is a lot of good development going on but unfortunately it
didn't quite make the merge window"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
proc: Fix unbalanced hard link numbers
signal: Make kill_proc_info static
rlimit: Properly call security_task_setrlimit
signal: Remove unused definition of sig_user_definied
ia64: Remove unused IA64_TASK_SIGHAND_OFFSET and IA64_SIGHAND_SIGLOCK_OFFSET
ipc: Remove unused declaration of recompute_msgmni
posix-timers: Correct sanity check in posix_cpu_nsleep
sysctl: Remove dead register_sysctl_root
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/generic.c | 1 | ||||
| -rw-r--r-- | fs/proc/proc_sysctl.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index ee27feb..9425c0d 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -472,6 +472,7 @@ struct proc_dir_entry *proc_create_mount_point(const char *name) ent->data = NULL; ent->proc_fops = NULL; ent->proc_iops = NULL; + parent->nlink++; if (proc_register(parent, ent) < 0) { kfree(ent); parent->nlink--; diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index d04ea43..67985a7 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -408,10 +408,6 @@ static void next_entry(struct ctl_table_header **phead, struct ctl_table **pentr *pentry = entry; } -void register_sysctl_root(struct ctl_table_root *root) -{ -} - /* * sysctl_perm does NOT grant the superuser all rights automatically, because * some sysctl variables are readonly even to root. |
