From 0504f9c49d93028cc741006b298cdab27ff37fa0 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 10 Aug 2009 11:32:44 -0300
Subject: [PATCH] --- yaml --- r: 162765 b: refs/heads/master c:
 79dd43bb85d64ba14a781f940c858d7bbe8c9a6d h: refs/heads/master i:   162763:
 0eeca4d463f2ed974ee94de6b4c865b11e88a329 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 c1ed48bf20d1..94decff5af66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16715dbe64ccac265010ab8b60848d212d002521
+refs/heads/master: 79dd43bb85d64ba14a781f940c858d7bbe8c9a6d
diff --git a/trunk/fs/xfs/xfs_log.c b/trunk/fs/xfs/xfs_log.c
index 3750f04ede0b..9dbdff3ea484 100644
--- a/trunk/fs/xfs/xfs_log.c
+++ b/trunk/fs/xfs/xfs_log.c
@@ -3180,7 +3180,7 @@ xlog_state_sync(xlog_t	  *log,
 STATIC void
 xlog_state_want_sync(xlog_t *log, xlog_in_core_t *iclog)
 {
-	ASSERT(spin_is_locked(&log->l_icloglock));
+	assert_spin_locked(&log->l_icloglock);
 
 	if (iclog->ic_state == XLOG_STATE_ACTIVE) {
 		xlog_state_switch_iclogs(log, iclog, 0);