diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2005-11-07 03:59:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:42 -0500 |
commit | cc4e69dee4a080f6eae3f410daec2593f4fa6f00 (patch) | |
tree | b9be8984a0be5f7997d836603963dcf8f2e728ff /fs/open.c | |
parent | 481bed454247538e9f57d4ea37b153ccba24ba7b (diff) |
[PATCH] VFS: pass file pointer to filesystem from ftruncate()
This patch extends the iattr structure with a file pointer memeber, and adds
an ATTR_FILE validity flag for this member.
This is set if do_truncate() is invoked from ftruncate() or from
do_coredump().
The change is source and binary compatible.
Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/open.c')
-rw-r--r-- | fs/open.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -194,7 +194,7 @@ out: | |||
194 | return error; | 194 | return error; |
195 | } | 195 | } |
196 | 196 | ||
197 | int do_truncate(struct dentry *dentry, loff_t length) | 197 | int do_truncate(struct dentry *dentry, loff_t length, struct file *filp) |
198 | { | 198 | { |
199 | int err; | 199 | int err; |
200 | struct iattr newattrs; | 200 | struct iattr newattrs; |
@@ -205,6 +205,10 @@ int do_truncate(struct dentry *dentry, loff_t length) | |||
205 | 205 | ||
206 | newattrs.ia_size = length; | 206 | newattrs.ia_size = length; |
207 | newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; | 207 | newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; |
208 | if (filp) { | ||
209 | newattrs.ia_file = filp; | ||
210 | newattrs.ia_valid |= ATTR_FILE; | ||
211 | } | ||
208 | 212 | ||
209 | down(&dentry->d_inode->i_sem); | 213 | down(&dentry->d_inode->i_sem); |
210 | err = notify_change(dentry, &newattrs); | 214 | err = notify_change(dentry, &newattrs); |
@@ -262,7 +266,7 @@ static inline long do_sys_truncate(const char __user * path, loff_t length) | |||
262 | error = locks_verify_truncate(inode, NULL, length); | 266 | error = locks_verify_truncate(inode, NULL, length); |
263 | if (!error) { | 267 | if (!error) { |
264 | DQUOT_INIT(inode); | 268 | DQUOT_INIT(inode); |
265 | error = do_truncate(nd.dentry, length); | 269 | error = do_truncate(nd.dentry, length, NULL); |
266 | } | 270 | } |
267 | put_write_access(inode); | 271 | put_write_access(inode); |
268 | 272 | ||
@@ -314,7 +318,7 @@ static inline long do_sys_ftruncate(unsigned int fd, loff_t length, int small) | |||
314 | 318 | ||
315 | error = locks_verify_truncate(inode, file, length); | 319 | error = locks_verify_truncate(inode, file, length); |
316 | if (!error) | 320 | if (!error) |
317 | error = do_truncate(dentry, length); | 321 | error = do_truncate(dentry, length, file); |
318 | out_putf: | 322 | out_putf: |
319 | fput(file); | 323 | fput(file); |
320 | out: | 324 | out: |