diff options
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 4a853ef6fd35..195a8cb2a749 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -316,6 +316,7 @@ struct poll_table_struct; | |||
316 | struct kstatfs; | 316 | struct kstatfs; |
317 | struct vm_area_struct; | 317 | struct vm_area_struct; |
318 | struct vfsmount; | 318 | struct vfsmount; |
319 | struct cred; | ||
319 | 320 | ||
320 | extern void __init inode_init(void); | 321 | extern void __init inode_init(void); |
321 | extern void __init inode_init_early(void); | 322 | extern void __init inode_init_early(void); |
@@ -827,7 +828,7 @@ struct file { | |||
827 | fmode_t f_mode; | 828 | fmode_t f_mode; |
828 | loff_t f_pos; | 829 | loff_t f_pos; |
829 | struct fown_struct f_owner; | 830 | struct fown_struct f_owner; |
830 | unsigned int f_uid, f_gid; | 831 | const struct cred *f_cred; |
831 | struct file_ra_state f_ra; | 832 | struct file_ra_state f_ra; |
832 | 833 | ||
833 | u64 f_version; | 834 | u64 f_version; |
@@ -1194,7 +1195,7 @@ enum { | |||
1194 | #define has_fs_excl() atomic_read(¤t->fs_excl) | 1195 | #define has_fs_excl() atomic_read(¤t->fs_excl) |
1195 | 1196 | ||
1196 | #define is_owner_or_cap(inode) \ | 1197 | #define is_owner_or_cap(inode) \ |
1197 | ((current->fsuid == (inode)->i_uid) || capable(CAP_FOWNER)) | 1198 | ((current_fsuid() == (inode)->i_uid) || capable(CAP_FOWNER)) |
1198 | 1199 | ||
1199 | /* not quite ready to be deprecated, but... */ | 1200 | /* not quite ready to be deprecated, but... */ |
1200 | extern void lock_super(struct super_block *); | 1201 | extern void lock_super(struct super_block *); |
@@ -1674,7 +1675,8 @@ extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs, | |||
1674 | extern long do_sys_open(int dfd, const char __user *filename, int flags, | 1675 | extern long do_sys_open(int dfd, const char __user *filename, int flags, |
1675 | int mode); | 1676 | int mode); |
1676 | extern struct file *filp_open(const char *, int, int); | 1677 | extern struct file *filp_open(const char *, int, int); |
1677 | extern struct file * dentry_open(struct dentry *, struct vfsmount *, int); | 1678 | extern struct file * dentry_open(struct dentry *, struct vfsmount *, int, |
1679 | const struct cred *); | ||
1678 | extern int filp_close(struct file *, fl_owner_t id); | 1680 | extern int filp_close(struct file *, fl_owner_t id); |
1679 | extern char * getname(const char __user *); | 1681 | extern char * getname(const char __user *); |
1680 | 1682 | ||