diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-12 19:43:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-12 19:43:20 -0700 |
| commit | 4ca6df134847a6349620b485a3e63f00fb3bfad8 (patch) | |
| tree | bf3ccdc0eaa41a2b51f134ba32d3ba28c9578b92 /fs/proc/internal.h | |
| parent | edaf3825182958a1fd5e39708fcb6ea48eca2060 (diff) | |
| parent | 2fd1d2c4ceb2248a727696962cf3370dc9f5a0a4 (diff) | |
| download | talos-obmc-linux-4ca6df134847a6349620b485a3e63f00fb3bfad8.tar.gz talos-obmc-linux-4ca6df134847a6349620b485a3e63f00fb3bfad8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull sysctl fix from Eric Biederman:
"A rather embarassing and hard to hit bug was merged into 4.11-rc1.
Andrei Vagin tracked this bug now and after some staring at the code
I came up with a fix"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
proc: Fix proc_sys_prune_dcache to hold a sb reference
Diffstat (limited to 'fs/proc/internal.h')
| -rw-r--r-- | fs/proc/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index c5ae09b6c726..18694598bebf 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -67,7 +67,7 @@ struct proc_inode { struct proc_dir_entry *pde; struct ctl_table_header *sysctl; struct ctl_table *sysctl_entry; - struct list_head sysctl_inodes; + struct hlist_node sysctl_inodes; const struct proc_ns_operations *ns_ops; struct inode vfs_inode; }; |
