diff options
Diffstat (limited to 'fs/open.c')
-rw-r--r-- | fs/open.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -194,7 +194,8 @@ out: | |||
194 | return error; | 194 | return error; |
195 | } | 195 | } |
196 | 196 | ||
197 | int do_truncate(struct dentry *dentry, loff_t length, struct file *filp) | 197 | int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, |
198 | struct file *filp) | ||
198 | { | 199 | { |
199 | int err; | 200 | int err; |
200 | struct iattr newattrs; | 201 | struct iattr newattrs; |
@@ -204,7 +205,7 @@ int do_truncate(struct dentry *dentry, loff_t length, struct file *filp) | |||
204 | return -EINVAL; | 205 | return -EINVAL; |
205 | 206 | ||
206 | newattrs.ia_size = length; | 207 | newattrs.ia_size = length; |
207 | newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; | 208 | newattrs.ia_valid = ATTR_SIZE | time_attrs; |
208 | if (filp) { | 209 | if (filp) { |
209 | newattrs.ia_file = filp; | 210 | newattrs.ia_file = filp; |
210 | newattrs.ia_valid |= ATTR_FILE; | 211 | newattrs.ia_valid |= ATTR_FILE; |
@@ -266,7 +267,7 @@ static inline long do_sys_truncate(const char __user * path, loff_t length) | |||
266 | error = locks_verify_truncate(inode, NULL, length); | 267 | error = locks_verify_truncate(inode, NULL, length); |
267 | if (!error) { | 268 | if (!error) { |
268 | DQUOT_INIT(inode); | 269 | DQUOT_INIT(inode); |
269 | error = do_truncate(nd.dentry, length, NULL); | 270 | error = do_truncate(nd.dentry, length, 0, NULL); |
270 | } | 271 | } |
271 | put_write_access(inode); | 272 | put_write_access(inode); |
272 | 273 | ||
@@ -318,7 +319,7 @@ static inline long do_sys_ftruncate(unsigned int fd, loff_t length, int small) | |||
318 | 319 | ||
319 | error = locks_verify_truncate(inode, file, length); | 320 | error = locks_verify_truncate(inode, file, length); |
320 | if (!error) | 321 | if (!error) |
321 | error = do_truncate(dentry, length, file); | 322 | error = do_truncate(dentry, length, 0, file); |
322 | out_putf: | 323 | out_putf: |
323 | fput(file); | 324 | fput(file); |
324 | out: | 325 | out: |