summaryrefslogtreecommitdiffstats
path: root/fs/nilfs2
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-06-24 14:29:45 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 20:47:47 -0400
commit562c72aa57c36b178eacc3500a0215651eca9429 (patch)
tree2c522c53ab26fc72e85e08747a08e3dca1207c87 /fs/nilfs2
parent11b80f459adaf91a712f95e7734a17655a36bf30 (diff)
downloadlinux-stable-562c72aa57c36b178eacc3500a0215651eca9429.tar.gz
linux-stable-562c72aa57c36b178eacc3500a0215651eca9429.tar.bz2
linux-stable-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/nilfs2')
-rw-r--r--fs/nilfs2/inode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index be8664c6a825..13f113154a9f 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -778,6 +778,8 @@ int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
if ((iattr->ia_valid & ATTR_SIZE) &&
iattr->ia_size != i_size_read(inode)) {
+ inode_dio_wait(inode);
+
err = vmtruncate(inode, iattr->ia_size);
if (unlikely(err))
goto out_err;