diff options
Diffstat (limited to 'include/linux/jbd.h')
-rw-r--r-- | include/linux/jbd.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 331530cd3cc6..516a2a27e87a 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/mutex.h> | 31 | #include <linux/mutex.h> |
32 | #include <linux/timer.h> | 32 | #include <linux/timer.h> |
33 | #include <linux/lockdep.h> | 33 | #include <linux/lockdep.h> |
34 | #include <linux/slab.h> | ||
34 | 35 | ||
35 | #define journal_oom_retry 1 | 36 | #define journal_oom_retry 1 |
36 | 37 | ||
@@ -246,19 +247,8 @@ typedef struct journal_superblock_s | |||
246 | 247 | ||
247 | #define J_ASSERT(assert) BUG_ON(!(assert)) | 248 | #define J_ASSERT(assert) BUG_ON(!(assert)) |
248 | 249 | ||
249 | #if defined(CONFIG_BUFFER_DEBUG) | ||
250 | void buffer_assertion_failure(struct buffer_head *bh); | ||
251 | #define J_ASSERT_BH(bh, expr) \ | ||
252 | do { \ | ||
253 | if (!(expr)) \ | ||
254 | buffer_assertion_failure(bh); \ | ||
255 | J_ASSERT(expr); \ | ||
256 | } while (0) | ||
257 | #define J_ASSERT_JH(jh, expr) J_ASSERT_BH(jh2bh(jh), expr) | ||
258 | #else | ||
259 | #define J_ASSERT_BH(bh, expr) J_ASSERT(expr) | 250 | #define J_ASSERT_BH(bh, expr) J_ASSERT(expr) |
260 | #define J_ASSERT_JH(jh, expr) J_ASSERT(expr) | 251 | #define J_ASSERT_JH(jh, expr) J_ASSERT(expr) |
261 | #endif | ||
262 | 252 | ||
263 | #if defined(JBD_PARANOID_IOFAIL) | 253 | #if defined(JBD_PARANOID_IOFAIL) |
264 | #define J_EXPECT(expr, why...) J_ASSERT(expr) | 254 | #define J_EXPECT(expr, why...) J_ASSERT(expr) |