aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2006-01-08 04:02:39 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 23:13:52 -0500
commit4a30131e7dbb17e5fec6958bfac9da9aff1fa29b (patch)
tree2ff6139b393a9a413e2ea4db4dd2d15eec2201f8 /include/linux/fs.h
parent788540141f4549637e89aadca6e25cf25eb53383 (diff)
[PATCH] Fix some problems with truncate and mtime semantics.
SUS requires that when truncating a file to the size that it currently is: truncate and ftruncate should NOT modify ctime or mtime O_TRUNC SHOULD modify ctime and mtime. Currently mtime and ctime are always modified on most local filesystems (side effect of ->truncate) or never modified (on NFS). With this patch: ATTR_CTIME|ATTR_MTIME are sent with ATTR_SIZE precisely when an update of these times is required whether size changes or not (via a new argument to do_truncate). This allows NFS to do the right thing for O_TRUNC. inode_setattr nolonger forces ATTR_MTIME|ATTR_CTIME when the ATTR_SIZE sets the size to it's current value. This allows local filesystems to do the right thing for f?truncate. Also, the logic in inode_setattr is changed a bit so there are two return points. One returns the error from vmtruncate if it failed, the other returns 0 (there can be no other failure). Finally, if vmtruncate succeeds, and ATTR_SIZE is the only change requested, we now fall-through and mark_inode_dirty. If a filesystem did not have a ->truncate function, then vmtruncate will have changed i_size, without marking the inode as 'dirty', and I think this is wrong. Signed-off-by: Neil Brown <neilb@suse.de> Cc: Christoph Hellwig <hch@lst.de> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index ef29500b5df8..74c01aabd4ab 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1344,7 +1344,8 @@ static inline int break_lease(struct inode *inode, unsigned int mode)
1344 1344
1345/* fs/open.c */ 1345/* fs/open.c */
1346 1346
1347extern int do_truncate(struct dentry *, loff_t start, struct file *filp); 1347extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
1348 struct file *filp);
1348extern long do_sys_open(const char __user *filename, int flags, int mode); 1349extern long do_sys_open(const char __user *filename, int flags, int mode);
1349extern struct file *filp_open(const char *, int, int); 1350extern struct file *filp_open(const char *, int, int);
1350extern struct file * dentry_open(struct dentry *, struct vfsmount *, int); 1351extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);