From 5467082707f60c98db6676ab392ae66d8e2ad228 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Sun, 18 Sep 2011 20:47:50 +0000
Subject: [PATCH] --- yaml --- r: 269913 b: refs/heads/master c:
 8292d88c5c833fc8b837c3a018fd6d72c35a3231 h: refs/heads/master i:   269911:
 67104b97ebec44cf100bc39e5f4fda2a125ee392 v: v3

---
 [refs]                    |  2 +-
 trunk/fs/xfs/xfs_export.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3dc4690a4068..305e773ed9a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b10370585349d364ff3c550afa7922e6e21f029d
+refs/heads/master: 8292d88c5c833fc8b837c3a018fd6d72c35a3231
diff --git a/trunk/fs/xfs/xfs_export.c b/trunk/fs/xfs/xfs_export.c
index 75e5d322e48f..da108977b21f 100644
--- a/trunk/fs/xfs/xfs_export.c
+++ b/trunk/fs/xfs/xfs_export.c
@@ -229,16 +229,16 @@ xfs_fs_nfs_commit_metadata(
 {
 	struct xfs_inode	*ip = XFS_I(inode);
 	struct xfs_mount	*mp = ip->i_mount;
-	int			error = 0;
+	xfs_lsn_t		lsn = 0;
 
 	xfs_ilock(ip, XFS_ILOCK_SHARED);
-	if (xfs_ipincount(ip)) {
-		error = _xfs_log_force_lsn(mp, ip->i_itemp->ili_last_lsn,
-				XFS_LOG_SYNC, NULL);
-	}
+	if (xfs_ipincount(ip))
+		lsn = ip->i_itemp->ili_last_lsn;
 	xfs_iunlock(ip, XFS_ILOCK_SHARED);
 
-	return error;
+	if (!lsn)
+		return 0;
+	return _xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL);
 }
 
 const struct export_operations xfs_export_operations = {