diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 13:41:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 13:41:51 -0700 |
| commit | 597a67e0ba758e3d2239c81fbb648c6e69ec30a2 (patch) | |
| tree | e2b6146df41943e7f87168fe3f5825722b434223 /fs/xfs/linux-2.6/xfs_file.c | |
| parent | 28890d3598c352ae065b560e0fded3e79c800ba1 (diff) | |
| parent | 510792ee29770a38dd409bf2b469ade2fea9eb52 (diff) | |
| download | op-kernel-dev-597a67e0ba758e3d2239c81fbb648c6e69ec30a2.zip op-kernel-dev-597a67e0ba758e3d2239c81fbb648c6e69ec30a2.tar.gz | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: optimize the negative xattr caching
xfs: prevent against ioend livelocks in xfs_file_fsync
xfs: flag all buffers as metadata
xfs: encapsulate a block of debug code
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_file.c')
| -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) { /* |
