diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-04-20 09:00:59 +0200 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-05-19 16:58:14 +0200 |
| commit | 37bc5743fdc29f60fb104cd9031babbabddff25a (patch) | |
| tree | abbcde46a9741a40a0ced8d1f289f6af65725d15 | |
| parent | xfs: xfs_trace.c: duplicated include (diff) | |
| download | linux-37bc5743fdc29f60fb104cd9031babbabddff25a.tar.xz linux-37bc5743fdc29f60fb104cd9031babbabddff25a.zip | |
xfs: wait for direct I/O to complete in fsync and write_inode
We need to wait for all pending direct I/O requests before taking care of
metadata in fsync and write_inode.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_file.c | 2 | ||||
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index 42dd3bcfba6b..d8fb1b5d6cb5 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c @@ -115,6 +115,8 @@ xfs_file_fsync( xfs_iflags_clear(ip, XFS_ITRUNCATED); + xfs_ioend_wait(ip); + /* * We always need to make sure that the required inode state is safe on * disk. The inode might be clean but we still might need to force the diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index e8ad6dd2c10c..e9002513e08f 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c @@ -1093,6 +1093,7 @@ xfs_fs_write_inode( * the code will only flush the inode if it isn't already * being flushed. */ + xfs_ioend_wait(ip); xfs_ilock(ip, XFS_ILOCK_SHARED); if (ip->i_update_core) { error = xfs_log_inode(ip); |