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/hfsplus | |
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/hfsplus')
-rw-r--r-- | fs/hfsplus/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index b248a6cfcad9..b0a0a4b621eb 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c | |||
@@ -296,6 +296,8 @@ static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr) | |||
296 | 296 | ||
297 | if ((attr->ia_valid & ATTR_SIZE) && | 297 | if ((attr->ia_valid & ATTR_SIZE) && |
298 | attr->ia_size != i_size_read(inode)) { | 298 | attr->ia_size != i_size_read(inode)) { |
299 | inode_dio_wait(inode); | ||
300 | |||
299 | error = vmtruncate(inode, attr->ia_size); | 301 | error = vmtruncate(inode, attr->ia_size); |
300 | if (error) | 302 | if (error) |
301 | return error; | 303 | return error; |