[Top] [All Lists]

[patch 54/71] xfs: fix spin_is_locked assert on uni-processor builds

To: linux-kernel@xxxxxxxxxxxxxxx, stable@xxxxxxxxxx
Subject: [patch 54/71] xfs: fix spin_is_locked assert on uni-processor builds
From: Greg KH <gregkh@xxxxxxx>
Date: Fri, 04 Sep 2009 17:14:29 -0700
Cc: stable-review@xxxxxxxxxx, torvalds@xxxxxxxxxxxxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx, alan@xxxxxxxxxxxxxxxxxxx, Felix Blyakher <felixb@xxxxxxx>, xfs@xxxxxxxxxxx, Christoph Hellwig <hch@xxxxxx>
In-reply-to: <20090905001824.GA18171@xxxxxxxxx>
References: <20090905001335.106974681@xxxxxxxxxxxxxx>
User-agent: quilt/0.48-1
2.6.30-stable review patch.  If anyone has any objections, please let us know.

From: Christoph Hellwig <hch@xxxxxxxxxxxxx>

upstream commit a8914f3a6d72c97328597a556a99daaf5cc288ae

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@xxxxxx>
Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
Reported-by: Johannes Engel <jcnengel@xxxxxxxxxxxxxx>
Tested-by: Johannes Engel <jcnengel@xxxxxxxxxxxxxx>
Signed-off-by: Felix Blyakher <felixb@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

 fs/xfs/xfs_log.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

<Prev in Thread] Current Thread [Next in Thread>
  • [patch 54/71] xfs: fix spin_is_locked assert on uni-processor builds, Greg KH <=