diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/linux/proc_fs.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/proc_fs.h')
| -rw-r--r-- | include/linux/proc_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 626fc65c4336..d0e1f1522a78 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
| @@ -129,7 +129,7 @@ int open_related_ns(struct ns_common *ns, | |||
| 129 | struct ns_common *(*get_ns)(struct ns_common *ns)); | 129 | struct ns_common *(*get_ns)(struct ns_common *ns)); |
| 130 | 130 | ||
| 131 | /* get the associated pid namespace for a file in procfs */ | 131 | /* get the associated pid namespace for a file in procfs */ |
| 132 | static inline struct pid_namespace *proc_pid_ns(struct inode *inode) | 132 | static inline struct pid_namespace *proc_pid_ns(const struct inode *inode) |
| 133 | { | 133 | { |
| 134 | return inode->i_sb->s_fs_info; | 134 | return inode->i_sb->s_fs_info; |
| 135 | } | 135 | } |
