From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - lost-sysctl-fix.patch removed from -mm tree Date: Mon, 28 Jul 2008 14:11:18 -0700 Message-ID: <200807282111.m6SLBIAM027663@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:42311 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761224AbYG1VL6 (ORCPT ); Mon, 28 Jul 2008 17:11:58 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: viro@ZenIV.linux.org.uk, mingo@elte.huviro@ZenIV.linux.org.uk, mm-commits@vger.kernel.org The patch titled lost sysctl fix has been removed from the -mm tree. Its filename was lost-sysctl-fix.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: lost sysctl fix From: Al Viro try_attach() should walk into the matching subdirectory, not the first one... Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- 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@ZenIV.linux.org.uk are origin.patch linux-next.patch