From: Ingo Molnar mystery patch. Signed-off-by: Andrew Morton --- fs/reiser4/txnmgr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN fs/reiser4/txnmgr.h~lock-validator-special-locking-reiser4-false-positive fs/reiser4/txnmgr.h --- devel/fs/reiser4/txnmgr.h~lock-validator-special-locking-reiser4-false-positive 2006-06-05 01:49:26.000000000 -0700 +++ devel-akpm/fs/reiser4/txnmgr.h 2006-06-05 01:49:26.000000000 -0700 @@ -567,7 +567,7 @@ static inline void spin_unlock_txnh(txn_ LOCK_CNT_DEC(spin_locked_txnh); LOCK_CNT_DEC(spin_locked); - spin_unlock(&(txnh->hlock)); + spin_unlock_non_nested(&(txnh->hlock)); } #define spin_ordering_pred_txnmgr(tmgr) \ @@ -613,7 +613,7 @@ static inline void spin_unlock_txnmgr(tx LOCK_CNT_DEC(spin_locked_txnmgr); LOCK_CNT_DEC(spin_locked); - spin_unlock(&(mgr->tmgr_lock)); + spin_unlock_non_nested(&(mgr->tmgr_lock)); } typedef enum { _