From 0fdb5e3138a092a45585b25d3b9aa40452c68879 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Wed, 17 Feb 2010 19:34:57 +0000
Subject: [PATCH] --- yaml --- r: 186381 b: refs/heads/master c:
 024910cbac323ab2e5ad6d7fa7958799b04b9728 h: refs/heads/master i:   186379:
 1c51ad70b111d3d5d88bb3b24daedaec2408f42e v: v3

---
 [refs]                            |  2 +-
 trunk/fs/xfs/linux-2.6/xfs_file.c | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 81645abd7a32..5b0c56c26d8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77d7a0c2eeb285c9069e15396703d0cb9690ac50
+refs/heads/master: 024910cbac323ab2e5ad6d7fa7958799b04b9728
diff --git a/trunk/fs/xfs/linux-2.6/xfs_file.c b/trunk/fs/xfs/linux-2.6/xfs_file.c
index 43f9554adaac..42dd3bcfba6b 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_file.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_file.c
@@ -180,17 +180,12 @@ xfs_file_fsync(
 		 * disk yet, the inode will be still be pinned.  If it is,
 		 * force the log.
 		 */
-		xfs_iunlock(ip, XFS_ILOCK_SHARED);
 		if (xfs_ipincount(ip)) {
-			if (ip->i_itemp->ili_last_lsn) {
-				error = _xfs_log_force_lsn(ip->i_mount,
-						ip->i_itemp->ili_last_lsn,
-						XFS_LOG_SYNC, &log_flushed);
-			} else {
-				error = _xfs_log_force(ip->i_mount,
-						XFS_LOG_SYNC, &log_flushed);
-			}
+			error = _xfs_log_force_lsn(ip->i_mount,
+					ip->i_itemp->ili_last_lsn,
+					XFS_LOG_SYNC, &log_flushed);
 		}
+		xfs_iunlock(ip, XFS_ILOCK_SHARED);
 	}
 
 	if (ip->i_mount->m_flags & XFS_MOUNT_BARRIER) {