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
This commit is contained in:
@@ -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--;
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user