From 8f6baabcb1aec9fd58c9d80ab44a43f2060ccb44 Mon Sep 17 00:00:00 2001
From: David Chinner <dgc@sgi.com>
Date: Thu, 10 Apr 2008 12:19:02 +1000
Subject: [PATCH] --- yaml --- r: 89403 b: refs/heads/master c:
 6b1d1a732f886936fe515d911b1a01d9cc50e179 h: refs/heads/master i:   89401:
 b6f6b9e020abb02245fc427e3a3b80c688066da6   89399:
 c599c32567ca93d8572a2088c9f67a64cbee3788 v: v3

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

diff --git a/[refs] b/[refs]
index 37536dfaa8ad..1110747023cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4679b2d36d53ed508c956337972fbbea8db99a77
+refs/heads/master: 6b1d1a732f886936fe515d911b1a01d9cc50e179
diff --git a/trunk/fs/xfs/xfs_log.c b/trunk/fs/xfs/xfs_log.c
index 319b98eb410c..4a6f7c5d1459 100644
--- a/trunk/fs/xfs/xfs_log.c
+++ b/trunk/fs/xfs/xfs_log.c
@@ -3499,8 +3499,8 @@ xfs_log_force_umount(
 	 * before we mark the filesystem SHUTDOWN and wake
 	 * everybody up to tell the bad news.
 	 */
-	spin_lock(&log->l_grant_lock);
 	spin_lock(&log->l_icloglock);
+	spin_lock(&log->l_grant_lock);
 	mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN;
 	XFS_BUF_DONE(mp->m_sb_bp);
 	/*