summaryrefslogtreecommitdiffstats
path: root/kernel/fs/utimes.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/fs/utimes.c')
-rw-r--r--kernel/fs/utimes.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/kernel/fs/utimes.c b/kernel/fs/utimes.c
index aa138d645..cb771c30d 100644
--- a/kernel/fs/utimes.c
+++ b/kernel/fs/utimes.c
@@ -87,20 +87,7 @@ static int utimes_common(struct path *path, struct timespec *times)
*/
newattrs.ia_valid |= ATTR_TIMES_SET;
} else {
- /*
- * If times is NULL (or both times are UTIME_NOW),
- * then we need to check permissions, because
- * inode_change_ok() won't do it.
- */
- error = -EACCES;
- if (IS_IMMUTABLE(inode))
- goto mnt_drop_write_and_out;
-
- if (!inode_owner_or_capable(inode)) {
- error = inode_permission(inode, MAY_WRITE);
- if (error)
- goto mnt_drop_write_and_out;
- }
+ newattrs.ia_valid |= ATTR_TOUCH;
}
retry_deleg:
mutex_lock(&inode->i_mutex);
@@ -112,7 +99,6 @@ retry_deleg:
goto retry_deleg;
}
-mnt_drop_write_and_out:
mnt_drop_write(path->mnt);
out:
return error;