diff options
| author | Christoph Egger <siccegge@stud.informatik.uni-erlangen.de> | 2010-02-05 14:13:33 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-03-05 00:20:20 +0100 |
| commit | c7e8d4d6dceeb6fd236991f590d3fa6f97c59874 (patch) | |
| tree | 79404097d7e2a94bf642ba427252dd662937f0f9 | |
| parent | e1f5c67a1994312300ebc41195e6f5bea2f6c065 (diff) | |
| download | linux-stable-c7e8d4d6dceeb6fd236991f590d3fa6f97c59874.tar.gz linux-stable-c7e8d4d6dceeb6fd236991f590d3fa6f97c59874.tar.bz2 linux-stable-c7e8d4d6dceeb6fd236991f590d3fa6f97c59874.zip | |
jbd[2]: remove references to BUFFER_DEBUG
CONFIG_BUFFER_DEBUG seems to have been removed from the documentation
somewhere around 2.4.15 and seemingly hasn't been available even
longer. It is, however, still referenced at one place from the jbd
code (one is a copy of the other header). Time to clean it up
Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: Jan Kara <jack@suse.cz>
| -rw-r--r-- | include/linux/jbd.h | 11 | ||||
| -rw-r--r-- | include/linux/jbd2.h | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 331530cd3cc6..f3aa59cb675d 100644 --- a/include/linux/jbd.h +++ b/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/include/linux/jbd2.h b/include/linux/jbd2.h index 638ce4554c76..4cf619161ed0 100644 --- a/include/linux/jbd2.h +++ b/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) |