From: Lachlan McIlroy <lachlan@sgi.com>
Date: Mon, 15 Oct 2007 03:18:02 +0000 (+1000)
Subject: [XFS] Turn off XBF_ASYNC flag before re-reading superblock.
X-Git-Tag: v2.6.24-rc1~492^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bebf963fec2f319d162c18d06b6592f572c9c101;p=linux-2.6-omap-h63xx.git

[XFS] Turn off XBF_ASYNC flag before re-reading superblock.

SGI-PV: 971603
SGI-Modid: xfs-linux-melb:xfs-kern:29871a

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
---

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index eb341461feb..851eca8a715 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3834,7 +3834,10 @@ xlog_do_recover(
 	 */
 	bp = xfs_getsb(log->l_mp, 0);
 	XFS_BUF_UNDONE(bp);
+	ASSERT(!(XFS_BUF_ISWRITE(bp)));
+	ASSERT(!(XFS_BUF_ISDELAYWRITE(bp)));
 	XFS_BUF_READ(bp);
+	XFS_BUF_UNASYNC(bp);
 	xfsbdstrat(log->l_mp, bp);
 	if ((error = xfs_iowait(bp))) {
 		xfs_ioerror_alert("xlog_do_recover",