diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-06-24 14:29:45 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 20:47:47 -0400 |
commit | 562c72aa57c36b178eacc3500a0215651eca9429 (patch) | |
tree | 2c522c53ab26fc72e85e08747a08e3dca1207c87 /fs/fat | |
parent | 11b80f459adaf91a712f95e7734a17655a36bf30 (diff) |
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')
-rw-r--r-- | fs/fat/file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/fat/file.c b/fs/fat/file.c index a4a3a3c06436..e1587c54d3c1 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c | |||
@@ -397,6 +397,8 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr) | |||
397 | * sequence. | 397 | * sequence. |
398 | */ | 398 | */ |
399 | if (attr->ia_valid & ATTR_SIZE) { | 399 | if (attr->ia_valid & ATTR_SIZE) { |
400 | inode_dio_wait(inode); | ||
401 | |||
400 | if (attr->ia_size > inode->i_size) { | 402 | if (attr->ia_size > inode->i_size) { |
401 | error = fat_cont_expand(inode, attr->ia_size); | 403 | error = fat_cont_expand(inode, attr->ia_size); |
402 | if (error || attr->ia_valid == ATTR_SIZE) | 404 | if (error || attr->ia_valid == ATTR_SIZE) |