From 7b070b06fec4833d8dd3e2e89729018ec6d6b5e9 Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Fri, 5 Feb 2010 14:13:33 +0100 Subject: [PATCH] --- yaml --- r: 186087 b: refs/heads/master c: c7e8d4d6dceeb6fd236991f590d3fa6f97c59874 h: refs/heads/master i: 186085: 8f4582ed47f0e825e8b9b02d9618c6930cfbd199 186083: 4d2f690ca50ccebb39f6a0ea96098a32ec7dffe0 186079: 1f5cf53dc9cc96d55e02dabda081d152996294d4 v: v3 --- [refs] | 2 +- trunk/include/linux/jbd.h | 11 ----------- trunk/include/linux/jbd2.h | 11 ----------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 5d5e925de217..66e8122ec08e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1f5c67a1994312300ebc41195e6f5bea2f6c065 +refs/heads/master: c7e8d4d6dceeb6fd236991f590d3fa6f97c59874 diff --git a/trunk/include/linux/jbd.h b/trunk/include/linux/jbd.h index 331530cd3cc6..f3aa59cb675d 100644 --- a/trunk/include/linux/jbd.h +++ b/trunk/include/linux/jbd.h @@ -246,19 +246,8 @@ typedef struct journal_superblock_s #define J_ASSERT(assert) BUG_ON(!(assert)) -#if defined(CONFIG_BUFFER_DEBUG) -void buffer_assertion_failure(struct buffer_head *bh); -#define J_ASSERT_BH(bh, expr) \ - do { \ - if (!(expr)) \ - buffer_assertion_failure(bh); \ - J_ASSERT(expr); \ - } while (0) -#define J_ASSERT_JH(jh, expr) J_ASSERT_BH(jh2bh(jh), expr) -#else #define J_ASSERT_BH(bh, expr) J_ASSERT(expr) #define J_ASSERT_JH(jh, expr) J_ASSERT(expr) -#endif #if defined(JBD_PARANOID_IOFAIL) #define J_EXPECT(expr, why...) J_ASSERT(expr) diff --git a/trunk/include/linux/jbd2.h b/trunk/include/linux/jbd2.h index 638ce4554c76..4cf619161ed0 100644 --- a/trunk/include/linux/jbd2.h +++ b/trunk/include/linux/jbd2.h @@ -284,19 +284,8 @@ typedef struct journal_superblock_s #define J_ASSERT(assert) BUG_ON(!(assert)) -#if defined(CONFIG_BUFFER_DEBUG) -void buffer_assertion_failure(struct buffer_head *bh); -#define J_ASSERT_BH(bh, expr) \ - do { \ - if (!(expr)) \ - buffer_assertion_failure(bh); \ - J_ASSERT(expr); \ - } while (0) -#define J_ASSERT_JH(jh, expr) J_ASSERT_BH(jh2bh(jh), expr) -#else #define J_ASSERT_BH(bh, expr) J_ASSERT(expr) #define J_ASSERT_JH(jh, expr) J_ASSERT(expr) -#endif #if defined(JBD2_PARANOID_IOFAIL) #define J_EXPECT(expr, why...) J_ASSERT(expr)