summaryrefslogtreecommitdiffstats
path: root/fs/hfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-06-24 20:29:45 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-21 02:47:47 +0200
commit562c72aa57c36b178eacc3500a0215651eca9429 (patch)
tree2c522c53ab26fc72e85e08747a08e3dca1207c87 /fs/hfs
parentrw_semaphore: remove up/down_read_non_owner (diff)
downloadlinux-562c72aa57c36b178eacc3500a0215651eca9429.tar.xz
linux-562c72aa57c36b178eacc3500a0215651eca9429.zip
fs: move inode_dio_wait calls into ->setattr
Let filesystems handle waiting for direct I/O requests themselves instead of doing it beforehand. This means filesystem-specific locks to prevent new dio referenes from appearing can be held. This is important to allow generalizing i_dio_count to non-DIO_LOCKING filesystems. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/hfs')
-rw-r--r--fs/hfs/inode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index fff16c968e67..48d567cc203e 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -615,6 +615,8 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)
if ((attr->ia_valid & ATTR_SIZE) &&
attr->ia_size != i_size_read(inode)) {
+ inode_dio_wait(inode);
+
error = vmtruncate(inode, attr->ia_size);
if (error)
return error;