Skip to contentSkip to conversation

xfs: fix spin_is_locked assert on uni-processor builds

PATCH In review Christoph Hellwig 3 participants 3 messages Aug 10, 2009 – Sep 25, 2009 XFS filesystem

lore
Share & tools
lore

Christoph Hellwig

author
#0 lore raw

PATCH 1/1 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.

This fixes kernel.org BZ #13621.

Signed-off-by Christoph Hellwig <[email protected]>
Reported-by Johannes Engel <[email protected]>
Tested-by Johannes Engel <[email protected]>
fs/xfs/xfs_log.c +1 -1
Index: linux-2.6/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);

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Christoph Hellwig

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.

oops!

Quoted 6 lines

This fixes kernel.org BZ #13621.

Signed-off-by Christoph Hellwig <[email protected]>
Reported-by Johannes Engel <[email protected]>
Tested-by Johannes Engel <[email protected]>
Reviewed-by Eric Sandeen <[email protected]>
Quoted 15 lines

Index: linux-2.6/fs/xfs/xfs_log.c
===================================================================

fs/xfs/xfs_log.c +1 -1
@@ -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);
Quoted 5 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#2 lore raw
In reply to Christoph Hellwig
Quoted 5 lines · Christoph Hellwig

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.

Looks good.

Quoted 3 lines
Signed-off-by Christoph Hellwig <[email protected]>
Reported-by Johannes Engel <[email protected]>
Tested-by Johannes Engel <[email protected]>
Reviewed-by Alex Elder <[email protected]>
Quoted 14 lines

Index: linux-2.6/fs/xfs/xfs_log.c
===================================================================

fs/xfs/xfs_log.c +1 -1
@@ -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);
Quoted 4 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs