Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lost sysctl fix

Browse source 
try_attach() should walk into the matching subdirectory, not the first one...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Tested-by: Valdis.Kletnieks@vt.edu
Tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2008-07-27 06:31:22 +01:00 committed by Linus Torvalds
parent 8be1a6d6c7
commit bfbcf03479
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kernel/sysctl.c
View file

@ -1680,43 +1680,45 @@ static __init int sysctl_init(void)
core_initcall(sysctl_init); core_initcall(sysctl_init);
static int is_branch_in(struct ctl_table *branch, struct ctl_table *table) static struct ctl_table *is_branch_in(struct ctl_table *branch,
struct ctl_table *table)
{ {
struct ctl_table *p; struct ctl_table *p;
const char *s = branch->procname; const char *s = branch->procname;
/* branch should have named subdirectory as its first element */ /* branch should have named subdirectory as its first element */
if (!s || !branch->child) if (!s || !branch->child)
return 0; return NULL;
/* ... and nothing else */ /* ... and nothing else */
if (branch[1].procname || branch[1].ctl_name) if (branch[1].procname || branch[1].ctl_name)
return 0; return NULL;
/* table should contain subdirectory with the same name */ /* table should contain subdirectory with the same name */
for (p = table; p->procname || p->ctl_name; p++) { for (p = table; p->procname || p->ctl_name; p++) {
if (!p->child) if (!p->child)
continue; continue;
if (p->procname && strcmp(p->procname, s) == 0) if (p->procname && strcmp(p->procname, s) == 0)
return 1; return p;
} }
return 0; return NULL;
} }
/* see if attaching q to p would be an improvement */ /* see if attaching q to p would be an improvement */
static void try_attach(struct ctl_table_header *p, struct ctl_table_header *q) static void try_attach(struct ctl_table_header *p, struct ctl_table_header *q)
{ {
struct ctl_table *to = p->ctl_table, *by = q->ctl_table; struct ctl_table *to = p->ctl_table, *by = q->ctl_table;
struct ctl_table *next;
int is_better = 0; int is_better = 0;
int not_in_parent = !p->attached_by; int not_in_parent = !p->attached_by;
while (is_branch_in(by, to)) { while ((next = is_branch_in(by, to)) != NULL) {
if (by == q->attached_by) if (by == q->attached_by)
is_better = 1; is_better = 1;
if (to == p->attached_by) if (to == p->attached_by)
not_in_parent = 1; not_in_parent = 1;
by = by->child; by = by->child;
to = to->child; to = next->child;
} }
if (is_better && not_in_parent) { if (is_better && not_in_parent) {