diff options
| author | Christoph Hellwig <hch@infradead.org> | 2011-07-26 15:07:11 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-07-26 22:06:39 -0500 |
| commit | d1166ec792c96b65e4c18cbc5985944b5309d838 (patch) | |
| tree | 683b74f000cd28d260674e767255e0284a9587d7 /fs/xfs | |
| parent | 34951f5cb72b1e3a89a21581cb21e2d5b6a104a4 (diff) | |
| download | op-kernel-dev-d1166ec792c96b65e4c18cbc5985944b5309d838.zip op-kernel-dev-d1166ec792c96b65e4c18cbc5985944b5309d838.tar.gz | |
xfs: prevent against ioend livelocks in xfs_file_fsync
We need to take some locks to prevent new ioends from coming in when we wait
for all existing ones to go away. Up to Linux 3.0 that was done using the
i_mutex held by the VFS fsync code, but now that we are called without
it we need to take care of it ourselves. Use the I/O lock instead of
i_mutex just like we do in other places.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index 825390e..7f7b424 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c @@ -149,7 +149,9 @@ xfs_file_fsync( xfs_iflags_clear(ip, XFS_ITRUNCATED); + xfs_ilock(ip, XFS_IOLOCK_SHARED); xfs_ioend_wait(ip); + xfs_iunlock(ip, XFS_IOLOCK_SHARED); if (mp->m_flags & XFS_MOUNT_BARRIER) { /* |
