Remove obsolete debugging. Remove a few assert checks. The BKL locking in all of these cases has actually been superceded by the journal datalist spinlock, so the checks should be removed entirely. --- linux-2.4-ext3merge/fs/jbd/transaction.c.=K0008=.orig Thu Sep 26 12:25:37 2002 +++ linux-2.4-ext3merge/fs/jbd/transaction.c Thu Sep 26 12:25:37 2002 @@ -1547,9 +1547,6 @@ assert_spin_locked(&journal_datalist_lock); transaction = jh->b_transaction; -#ifdef __SMP__ - J_ASSERT (current->lock_depth >= 0); -#endif J_ASSERT_JH(jh, jh->b_jlist < BJ_Types); if (jh->b_jlist != BJ_None) @@ -1971,9 +1968,6 @@ assert_spin_locked(&journal_datalist_lock); -#ifdef __SMP__ - J_ASSERT (current->lock_depth >= 0); -#endif J_ASSERT_JH(jh, jh->b_jlist < BJ_Types); J_ASSERT_JH(jh, jh->b_transaction == transaction || jh->b_transaction == 0); @@ -2056,9 +2050,6 @@ int was_dirty = 0; assert_spin_locked(&journal_datalist_lock); -#ifdef __SMP__ - J_ASSERT_JH(jh, current->lock_depth >= 0); -#endif /* If the buffer is now unused, just drop it. */ if (jh->b_next_transaction == NULL) { __journal_unfile_buffer(jh);