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/ext2 | |
| parent | 11b80f459adaf91a712f95e7734a17655a36bf30 (diff) | |
| download | linux-562c72aa57c36b178eacc3500a0215651eca9429.tar.gz linux-562c72aa57c36b178eacc3500a0215651eca9429.tar.bz2 linux-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/ext2')
| -rw-r--r-- | fs/ext2/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 788e09a07f7e..06e7c767ab35 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -1184,6 +1184,8 @@ static int ext2_setsize(struct inode *inode, loff_t newsize) if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) return -EPERM; + inode_dio_wait(inode); + if (mapping_is_xip(inode->i_mapping)) error = xip_truncate_page(inode->i_mapping, newsize); else if (test_opt(inode->i_sb, NOBH)) |