| From eaae5697d2c02843ed17a7da827f21d586d7a52d Mon Sep 17 00:00:00 2001 |
| From: Ingo Molnar <mingo@elte.hu> |
| Date: Fri, 3 Jul 2009 08:29:56 -0500 |
| Subject: [PATCH] fs: Make jbd assertions smp only |
| |
| commit 28303e27fd7d323850dde97b6e06cf727611f348 in tip. |
| |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c |
| index 99e9fea..b737b5b 100644 |
| --- a/fs/jbd/transaction.c |
| +++ b/fs/jbd/transaction.c |
| @@ -1577,7 +1577,7 @@ static void __journal_temp_unlink_buffer(struct journal_head *jh) |
| transaction_t *transaction; |
| struct buffer_head *bh = jh2bh(jh); |
| |
| - J_ASSERT_JH(jh, jbd_is_locked_bh_state(bh)); |
| + J_ASSERT_JH_SMP(jh, jbd_is_locked_bh_state(bh)); |
| transaction = jh->b_transaction; |
| if (transaction) |
| assert_spin_locked(&transaction->t_journal->j_list_lock); |
| @@ -2043,7 +2043,7 @@ void __journal_file_buffer(struct journal_head *jh, |
| int was_dirty = 0; |
| struct buffer_head *bh = jh2bh(jh); |
| |
| - J_ASSERT_JH(jh, jbd_is_locked_bh_state(bh)); |
| + J_ASSERT_JH_SMP(jh, jbd_is_locked_bh_state(bh)); |
| assert_spin_locked(&transaction->t_journal->j_list_lock); |
| |
| J_ASSERT_JH(jh, jh->b_jlist < BJ_Types); |
| @@ -2137,7 +2137,7 @@ void __journal_refile_buffer(struct journal_head *jh) |
| int was_dirty, jlist; |
| struct buffer_head *bh = jh2bh(jh); |
| |
| - J_ASSERT_JH(jh, jbd_is_locked_bh_state(bh)); |
| + J_ASSERT_JH_SMP(jh, jbd_is_locked_bh_state(bh)); |
| if (jh->b_transaction) |
| assert_spin_locked(&jh->b_transaction->t_journal->j_list_lock); |
| |
| diff --git a/include/linux/jbd.h b/include/linux/jbd.h |
| index bba07bd..05449a0 100644 |
| --- a/include/linux/jbd.h |
| +++ b/include/linux/jbd.h |
| @@ -249,6 +249,15 @@ typedef struct journal_superblock_s |
| #define J_ASSERT_BH(bh, expr) J_ASSERT(expr) |
| #define J_ASSERT_JH(jh, expr) J_ASSERT(expr) |
| |
| +/* |
| + * For assertions that are only valid on SMP (e.g. spin_is_locked()): |
| + */ |
| +#ifdef CONFIG_SMP |
| +# define J_ASSERT_JH_SMP(jh, expr) J_ASSERT_JH(jh, expr) |
| +#else |
| +# define J_ASSERT_JH_SMP(jh, assert) do { } while (0) |
| +#endif |
| + |
| #if defined(JBD_PARANOID_IOFAIL) |
| #define J_EXPECT(expr, why...) J_ASSERT(expr) |
| #define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr) |
| -- |
| 1.7.1.1 |
| |