diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-01-07 15:57:47 +0100 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-01-25 01:40:28 +0100 |
| commit | 3cc3e04636d603778d921854b84ae7bd34a349a2 (patch) | |
| tree | a71b0271933f3ed5d30ec7b15fc07e55af80ace6 /fs/proc | |
| parent | sysctl: Remove the now unused ctl_table parent field. (diff) | |
| download | linux-3cc3e04636d603778d921854b84ae7bd34a349a2.tar.xz linux-3cc3e04636d603778d921854b84ae7bd34a349a2.zip | |
sysctl: A more obvious version of grab_header.
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>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | 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 e573f9b4f22e..15444850b3e8 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, |