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/jfs | |
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/jfs')
-rw-r--r-- | fs/jfs/file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jfs/file.c b/fs/jfs/file.c index 2f3f531f3606..9f32315acef1 100644 --- a/fs/jfs/file.c +++ b/fs/jfs/file.c | |||
@@ -110,6 +110,8 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr) | |||
110 | 110 | ||
111 | if ((iattr->ia_valid & ATTR_SIZE) && | 111 | if ((iattr->ia_valid & ATTR_SIZE) && |
112 | iattr->ia_size != i_size_read(inode)) { | 112 | iattr->ia_size != i_size_read(inode)) { |
113 | inode_dio_wait(inode); | ||
114 | |||
113 | rc = vmtruncate(inode, iattr->ia_size); | 115 | rc = vmtruncate(inode, iattr->ia_size); |
114 | if (rc) | 116 | if (rc) |
115 | return rc; | 117 | return rc; |