summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig2009-08-10 16:32:44 +0200
committerFelix Blyakher2009-08-11 23:05:25 +0200
commit79dd43bb85d64ba14a781f940c858d7bbe8c9a6d (patch)
tree418197bfdebdf3fea0cad4be301ccbd0d3d2d5cb
parentxfs: check for dinode realtime flag corruption (diff)
downloadkernel-qcow2-linux-79dd43bb85d64ba14a781f940c858d7bbe8c9a6d.tar.gz
kernel-qcow2-linux-79dd43bb85d64ba14a781f940c858d7bbe8c9a6d.tar.xz
kernel-qcow2-linux-79dd43bb85d64ba14a781f940c858d7bbe8c9a6d.zip
xfs: fix spin_is_locked assert on uni-processor builds
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@lst.de> Reviewed-by: Eric Sandeen <sandeen@sandeen.net> Reported-by: Johannes Engel <jcnengel@googlemail.com> Tested-by: Johannes Engel <jcnengel@googlemail.com> Signed-off-by: Felix Blyakher <felixb@sgi.com>
-rw-r--r--fs/xfs/xfs_log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 3750f04ede0b..9dbdff3ea484 100644
--- 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);