aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorChristoph Egger <siccegge@stud.informatik.uni-erlangen.de>2010-02-05 08:13:33 -0500
committerJan Kara <jack@suse.cz>2010-03-04 18:20:20 -0500
commitc7e8d4d6dceeb6fd236991f590d3fa6f97c59874 (patch)
tree79404097d7e2a94bf642ba427252dd662937f0f9 /include/linux
parente1f5c67a1994312300ebc41195e6f5bea2f6c065 (diff)
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>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/jbd.h11
-rw-r--r--include/linux/jbd2.h11
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
246 246
247#define J_ASSERT(assert) BUG_ON(!(assert)) 247#define J_ASSERT(assert) BUG_ON(!(assert))
248 248
249#if defined(CONFIG_BUFFER_DEBUG)
250void 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) 249#define J_ASSERT_BH(bh, expr) J_ASSERT(expr)
260#define J_ASSERT_JH(jh, expr) J_ASSERT(expr) 250#define J_ASSERT_JH(jh, expr) J_ASSERT(expr)
261#endif
262 251
263#if defined(JBD_PARANOID_IOFAIL) 252#if defined(JBD_PARANOID_IOFAIL)
264#define J_EXPECT(expr, why...) J_ASSERT(expr) 253#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
284 284
285#define J_ASSERT(assert) BUG_ON(!(assert)) 285#define J_ASSERT(assert) BUG_ON(!(assert))
286 286
287#if defined(CONFIG_BUFFER_DEBUG)
288void buffer_assertion_failure(struct buffer_head *bh);
289#define J_ASSERT_BH(bh, expr) \
290 do { \
291 if (!(expr)) \
292 buffer_assertion_failure(bh); \
293 J_ASSERT(expr); \
294 } while (0)
295#define J_ASSERT_JH(jh, expr) J_ASSERT_BH(jh2bh(jh), expr)
296#else
297#define J_ASSERT_BH(bh, expr) J_ASSERT(expr) 287#define J_ASSERT_BH(bh, expr) J_ASSERT(expr)
298#define J_ASSERT_JH(jh, expr) J_ASSERT(expr) 288#define J_ASSERT_JH(jh, expr) J_ASSERT(expr)
299#endif
300 289
301#if defined(JBD2_PARANOID_IOFAIL) 290#if defined(JBD2_PARANOID_IOFAIL)
302#define J_EXPECT(expr, why...) J_ASSERT(expr) 291#define J_EXPECT(expr, why...) J_ASSERT(expr)