diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 05:43:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 05:43:20 +0300 |
| commit | 4ca6df134847a6349620b485a3e63f00fb3bfad8 (patch) | |
| tree | bf3ccdc0eaa41a2b51f134ba32d3ba28c9578b92 /include | |
| parent | edaf3825182958a1fd5e39708fcb6ea48eca2060 (diff) | |
| parent | 2fd1d2c4ceb2248a727696962cf3370dc9f5a0a4 (diff) | |
| download | linux-4ca6df134847a6349620b485a3e63f00fb3bfad8.tar.xz | |
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 'include')
| -rw-r--r-- | include/linux/sysctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 80d07816def0..1c04a26bfd2f 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -143,7 +143,7 @@ struct ctl_table_header struct ctl_table_set *set; struct ctl_dir *parent; struct ctl_node *node; - struct list_head inodes; /* head for proc_inode->sysctl_inodes */ + struct hlist_head inodes; /* head for proc_inode->sysctl_inodes */ }; struct ctl_dir { |