diff options
| -rw-r--r-- | fs/coredump.c | 2 | ||||
| -rw-r--r-- | fs/open.c | 2 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/coredump.c b/fs/coredump.c index b398594e4..5d5803cb6 100644 --- a/fs/coredump.c +++ b/fs/coredump.c @@ -682,7 +682,7 @@ void do_coredump(siginfo_t *siginfo) goto close_fail; if (!cprm.file->f_op || !cprm.file->f_op->write) goto close_fail; - if (do_truncate(cprm.file->f_path.dentry, 0, 0, cprm.file)) + if (do_truncate2(cprm.file->f_path.mnt, cprm.file->f_path.dentry, 0, 0, cprm.file)) goto close_fail; } @@ -196,7 +196,7 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small) if (!error) error = security_path_truncate(&f.file->f_path); if (!error) - error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file); + error = do_truncate2(mnt, dentry, length, ATTR_MTIME|ATTR_CTIME, f.file); sb_end_write(inode->i_sb); out_putf: fdput(f); diff --git a/include/linux/fs.h b/include/linux/fs.h index 60bdc669b..8262b5403 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2264,8 +2264,8 @@ extern sector_t bmap(struct inode *, sector_t); extern int notify_change(struct dentry *, struct iattr *); extern int notify_change2(struct vfsmount *, struct dentry *, struct iattr *); extern int inode_permission(struct inode *, int); -extern int generic_permission(struct inode *, int); extern int inode_permission2(struct vfsmount *, struct inode *, int); +extern int generic_permission(struct inode *, int); static inline bool execute_ok(struct inode *inode) { |