commit bebf963fec2f319d162c18d06b6592f572c9c101
author Lachlan McIlroy <lachlan@sgi.com> Mon Oct 15 13:18:02 2007 +1000
committer Tim Shimmin <tes@chook.melbourne.sgi.com> Tue Oct 16 14:22:39 2007 +1000
tree 71abaab06023eb581f9fa059da119da553532493
parent e893bffd4cf2f000f3058319eea5abeeb1755969

[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>

fs/xfs/xfs_log_recover.c

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index eb34146..851eca8 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3834,7 +3834,10 @@
 	 */
 	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",