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

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

[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.


Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Johannes Engel <jcnengel@googlemail.com>
Tested-by: Johannes Engel <jcnengel@googlemail.com>

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);

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Eric Sandeen]

Christoph Hellwig wrote:
> 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!

> This fixes kernel.org BZ #13621.
> 
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reported-by: Johannes Engel <jcnengel@googlemail.com>
> Tested-by: Johannes Engel <jcnengel@googlemail.com>

Reviewed-by: Eric Sandeen <sandeen@sandeen.net>

> 
> 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);
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Alex Elder]

Christoph Hellwig wrote:
> 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.

> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reported-by: Johannes Engel <jcnengel@googlemail.com>
> Tested-by: Johannes Engel <jcnengel@googlemail.com>
Reviewed-by: Alex Elder <aelder@sgi.com>

> 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);
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs