path: root/fs/proc/proc_sysctl.c
diff options
authorEric W. Biederman <ebiederm@xmission.com>2012-01-07 06:57:47 -0800
committerEric W. Biederman <ebiederm@xmission.com>2012-01-24 16:40:28 -0800
commit3cc3e04636d603778d921854b84ae7bd34a349a2 (patch)
treea71b0271933f3ed5d30ec7b15fc07e55af80ace6 /fs/proc/proc_sysctl.c
parent8d6ecfcc014332fd2fe933f64194160f0e3a6696 (diff)
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/proc_sysctl.c')
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index e573f9b4f22..15444850b3e 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,