Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

[~andy/linux] / fs / proc / proc_sysctl.c

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index dcd56f84db7ebcce37e884cae218c90d795109b0..a781bdf0669464ced3e213faad5ed6ab3a37a06b 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -142,6 +142,7 @@ static int insert_entry(struct ctl_table_header *head, struct ctl_table *entry)
        }
 
        rb_link_node(node, parent, p);
+       rb_insert_color(node, &head->parent->root);
        return 0;
 }
 
@@ -168,10 +169,8 @@ static void init_header(struct ctl_table_header *head,
        head->node = node;
        if (node) {
                struct ctl_table *entry;
-               for (entry = table; entry->procname; entry++, node++) {
-                       rb_init_node(&node->node);
+               for (entry = table; entry->procname; entry++, node++)
                        node->header = head;
-               }
        }
 }