diff options
Diffstat (limited to 'fs/utimes.c')
-rw-r--r-- | fs/utimes.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/fs/utimes.c b/fs/utimes.c index 794f5f5b1fb5..ba54b9e648c9 100644 --- a/fs/utimes.c +++ b/fs/utimes.c | |||
@@ -87,21 +87,7 @@ static int utimes_common(struct path *path, struct timespec *times) | |||
87 | */ | 87 | */ |
88 | newattrs.ia_valid |= ATTR_TIMES_SET; | 88 | newattrs.ia_valid |= ATTR_TIMES_SET; |
89 | } else { | 89 | } else { |
90 | /* | 90 | newattrs.ia_valid |= ATTR_TOUCH; |
91 | * If times is NULL (or both times are UTIME_NOW), | ||
92 | * then we need to check permissions, because | ||
93 | * inode_change_ok() won't do it. | ||
94 | */ | ||
95 | error = -EPERM; | ||
96 | if (IS_IMMUTABLE(inode)) | ||
97 | goto mnt_drop_write_and_out; | ||
98 | |||
99 | error = -EACCES; | ||
100 | if (!inode_owner_or_capable(inode)) { | ||
101 | error = inode_permission(inode, MAY_WRITE); | ||
102 | if (error) | ||
103 | goto mnt_drop_write_and_out; | ||
104 | } | ||
105 | } | 91 | } |
106 | retry_deleg: | 92 | retry_deleg: |
107 | inode_lock(inode); | 93 | inode_lock(inode); |
@@ -113,7 +99,6 @@ retry_deleg: | |||
113 | goto retry_deleg; | 99 | goto retry_deleg; |
114 | } | 100 | } |
115 | 101 | ||
116 | mnt_drop_write_and_out: | ||
117 | mnt_drop_write(path->mnt); | 102 | mnt_drop_write(path->mnt); |
118 | out: | 103 | out: |
119 | return error; | 104 | return error; |