Skip to content

Commit

Permalink
xfs: wait for direct I/O to complete in fsync and write_inode
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christoph Hellwig authored and Alex Elder committed May 19, 2010
1 parent fce1cad commit 37bc574
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fs/xfs/linux-2.6/xfs_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions fs/xfs/linux-2.6/xfs_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 37bc574

Please sign in to comment.