summaryrefslogtreecommitdiffstats
path: root/fs/fat/file.c
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/fat/file.c
parent11b80f459adaf91a712f95e7734a17655a36bf30 (diff)
downloadop-kernel-dev-562c72aa57c36b178eacc3500a0215651eca9429.zip
op-kernel-dev-562c72aa57c36b178eacc3500a0215651eca9429.tar.gz
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/fat/file.c')
-rw-r--r--fs/fat/file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/fat/file.c b/fs/fat/file.c
index a4a3a3c..e1587c5 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -397,6 +397,8 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr)
* sequence.
*/
if (attr->ia_valid & ATTR_SIZE) {
+ inode_dio_wait(inode);
+
if (attr->ia_size > inode->i_size) {
error = fat_cont_expand(inode, attr->ia_size);
if (error || attr->ia_valid == ATTR_SIZE)
OpenPOWER on IntegriCloud