xfs
[Top] [All Lists]

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

To: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Subject: Re: [PATCH] xfs: fix spin_is_locked assert on uni-processor builds
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Mon, 10 Aug 2009 09:19:33 -0500
Cc: xfs@xxxxxxxxxxx
In-reply-to: <20090810140006.GA21521@xxxxxxxxxxxxx>
References: <20090810140006.GA21521@xxxxxxxxxxxxx>
User-agent: Thunderbird 2.0.0.22 (Macintosh/20090605)
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@xxxxxx>
> Reported-by: Johannes Engel <jcnengel@xxxxxxxxxxxxxx>
> Tested-by: Johannes Engel <jcnengel@xxxxxxxxxxxxxx>

Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxxx>

> 
> 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@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
> 

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