The patch titled
lost sysctl fix
has been added to the -mm tree. Its filename is
lost-sysctl-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: lost sysctl fix
From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
try_attach() should walk into the matching subdirectory, not the first one...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/sysctl.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff -puN kernel/sysctl.c~lost-sysctl-fix kernel/sysctl.c
--- a/kernel/sysctl.c~lost-sysctl-fix
+++ a/kernel/sysctl.c
@@ -1704,43 +1704,45 @@ static __init int sysctl_init(void)
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;
const char *s = branch->procname;
/* branch should have named subdirectory as its first element */
if (!s || !branch->child)
- return 0;
+ return NULL;
/* ... and nothing else */
if (branch[1].procname || branch[1].ctl_name)
- return 0;
+ return NULL;
/* table should contain subdirectory with the same name */
for (p = table; p->procname || p->ctl_name; p++) {
if (!p->child)
continue;
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 */
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 *next;
int is_better = 0;
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)
is_better = 1;
if (to == p->attached_by)
not_in_parent = 1;
by = by->child;
- to = to->child;
+ to = next->child;
}
if (is_better && not_in_parent) {
_
Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxxxx are
origin.patch
linux-next.patch
lost-sysctl-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
