From: Greg KH on
2.6.30-stable review patch. If anyone has any objections, please let us know.

------------------
From: Christoph Hellwig <hch(a)infradead.org>

upstream commit a8914f3a6d72c97328597a556a99daaf5cc288ae

Without SMP or preemption spin_is_locked always returns false,
so we can't do an assert with it. Instead use assert_spin_locked,
which does the right thing on all builds.


Signed-off-by: Christoph Hellwig <hch(a)lst.de>
Reviewed-by: Eric Sandeen <sandeen(a)sandeen.net>
Reported-by: Johannes Engel <jcnengel(a)googlemail.com>
Tested-by: Johannes Engel <jcnengel(a)googlemail.com>
Signed-off-by: Felix Blyakher <felixb(a)sgi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
fs/xfs/xfs_log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3180,7 +3180,7 @@ try_again:
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);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/