lkml.org 
[lkml]   [2012]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/29] sysctl: Factor out insert_header and erase_header
    Date
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    fs/proc/proc_sysctl.c | 16 +++++++++++++---
    1 files changed, 13 insertions(+), 3 deletions(-)

    diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
    index 4979925..7e96a26 100644
    --- a/fs/proc/proc_sysctl.c
    +++ b/fs/proc/proc_sysctl.c
    @@ -57,6 +57,17 @@ static void init_header(struct ctl_table_header *head,
    head->parent = NULL;
    }

    +static void erase_header(struct ctl_table_header *head)
    +{
    + list_del_init(&head->ctl_entry);
    +}
    +
    +static void insert_header(struct ctl_table_header *header)
    +{
    + header->parent->count++;
    + list_add_tail(&header->ctl_entry, &header->set->list);
    +}
    +
    /* called under sysctl_lock */
    static int use_table(struct ctl_table_header *p)
    {
    @@ -96,7 +107,7 @@ static void start_unregistering(struct ctl_table_header *p)
    * do not remove from the list until nobody holds it; walking the
    * list in do_sysctl() relies on that.
    */
    - list_del_init(&p->ctl_entry);
    + erase_header(p);
    }

    static void sysctl_head_get(struct ctl_table_header *head)
    @@ -974,8 +985,7 @@ struct ctl_table_header *__register_sysctl_table(
    }
    if (sysctl_check_dups(namespaces, header, path, table))
    goto fail_locked;
    - header->parent->count++;
    - list_add_tail(&header->ctl_entry, &header->set->list);
    + insert_header(header);
    spin_unlock(&sysctl_lock);

    return header;
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2012-01-27 06:05    [W:9.064 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site