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 14/29] sysctl: A more obvious version of grab_header.
    Date
    Instead of relying on sysct_head_next(NULL) to magically
    return the right header for the root directory instead
    explicitly transform NULL into the root directories header.

    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    fs/proc/proc_sysctl.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
    index e573f9b..1544485 100644
    --- a/fs/proc/proc_sysctl.c
    +++ b/fs/proc/proc_sysctl.c
    @@ -267,10 +267,10 @@ static struct ctl_table *find_in_table(struct ctl_table *p, struct qstr *name)

    static struct ctl_table_header *grab_header(struct inode *inode)
    {
    - if (PROC_I(inode)->sysctl)
    - return sysctl_head_grab(PROC_I(inode)->sysctl);
    - else
    - return sysctl_head_next(NULL);
    + struct ctl_table_header *head = PROC_I(inode)->sysctl;
    + if (!head)
    + head = &root_table_header;
    + return sysctl_head_grab(head);
    }

    static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2012-01-27 06:07    [W:0.021 / U:0.512 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site