aboutsummaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 3479b176a4cd..13ff4abdbdca 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -282,8 +282,7 @@ int inode_permission(struct inode *inode, int mask)
282 if (retval) 282 if (retval)
283 return retval; 283 return retval;
284 284
285 return security_inode_permission(inode, 285 return security_inode_permission(inode, mask);
286 mask & (MAY_READ|MAY_WRITE|MAY_EXEC|MAY_APPEND));
287} 286}
288 287
289/** 288/**
@@ -1484,8 +1483,7 @@ static int handle_truncate(struct path *path)
1484 */ 1483 */
1485 error = locks_verify_locked(inode); 1484 error = locks_verify_locked(inode);
1486 if (!error) 1485 if (!error)
1487 error = security_path_truncate(path, 0, 1486 error = security_path_truncate(path);
1488 ATTR_MTIME|ATTR_CTIME|ATTR_OPEN);
1489 if (!error) { 1487 if (!error) {
1490 error = do_truncate(path->dentry, 0, 1488 error = do_truncate(path->dentry, 0,
1491 ATTR_MTIME|ATTR_CTIME|ATTR_OPEN, 1489 ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,