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/file.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/file.h')
| -rw-r--r-- | include/linux/file.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/file.h b/include/linux/file.h index 279720db984a..6b2fb032416c 100644 --- a/include/linux/file.h +++ b/include/linux/file.h | |||
| @@ -17,9 +17,12 @@ extern void fput(struct file *); | |||
| 17 | struct file_operations; | 17 | struct file_operations; |
| 18 | struct vfsmount; | 18 | struct vfsmount; |
| 19 | struct dentry; | 19 | struct dentry; |
| 20 | struct inode; | ||
| 20 | struct path; | 21 | struct path; |
| 21 | extern struct file *alloc_file(const struct path *, fmode_t mode, | 22 | extern struct file *alloc_file_pseudo(struct inode *, struct vfsmount *, |
| 22 | const struct file_operations *fop); | 23 | const char *, int flags, const struct file_operations *); |
| 24 | extern struct file *alloc_file_clone(struct file *, int flags, | ||
| 25 | const struct file_operations *); | ||
| 23 | 26 | ||
| 24 | static inline void fput_light(struct file *file, int fput_needed) | 27 | static inline void fput_light(struct file *file, int fput_needed) |
| 25 | { | 28 | { |
| @@ -78,7 +81,6 @@ extern int f_dupfd(unsigned int from, struct file *file, unsigned flags); | |||
| 78 | extern int replace_fd(unsigned fd, struct file *file, unsigned flags); | 81 | extern int replace_fd(unsigned fd, struct file *file, unsigned flags); |
| 79 | extern void set_close_on_exec(unsigned int fd, int flag); | 82 | extern void set_close_on_exec(unsigned int fd, int flag); |
| 80 | extern bool get_close_on_exec(unsigned int fd); | 83 | extern bool get_close_on_exec(unsigned int fd); |
| 81 | extern void put_filp(struct file *); | ||
| 82 | extern int get_unused_fd_flags(unsigned flags); | 84 | extern int get_unused_fd_flags(unsigned flags); |
| 83 | extern void put_unused_fd(unsigned int fd); | 85 | extern void put_unused_fd(unsigned int fd); |
| 84 | 86 | ||
