xfs
[Top] [All Lists]

[PATCH] xfs: fix spin_is_locked assert on uni-processor builds

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs: fix spin_is_locked assert on uni-processor builds
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Mon, 10 Aug 2009 10:00:06 -0400
User-agent: Mutt/1.5.19 (2009-01-05)
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.

This fixes kernel.org BZ #13621.


Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reported-by: Johannes Engel <jcnengel@xxxxxxxxxxxxxx>
Tested-by: Johannes Engel <jcnengel@xxxxxxxxxxxxxx>

Index: linux-2.6/fs/xfs/xfs_log.c
===================================================================
--- linux-2.6.orig/fs/xfs/xfs_log.c     2009-08-09 23:27:07.889729629 -0300
+++ linux-2.6/fs/xfs/xfs_log.c  2009-08-09 23:27:24.092725926 -0300
@@ -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);

<Prev in Thread] Current Thread [Next in Thread>