소스 검색

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>
Christoph Egger 15 년 전
부모
커밋
c7e8d4d6dc
2개의 변경된 파일0개의 추가작업 그리고 22개의 파일을 삭제
  1. 0 11
      include/linux/jbd.h
  2. 0 11
      include/linux/jbd2.h

+ 0 - 11
include/linux/jbd.h

@@ -246,19 +246,8 @@ typedef struct journal_superblock_s
 
 
 #define J_ASSERT(assert)	BUG_ON(!(assert))
 #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_BH(bh, expr)	J_ASSERT(expr)
 #define J_ASSERT_JH(jh, expr)	J_ASSERT(expr)
 #define J_ASSERT_JH(jh, expr)	J_ASSERT(expr)
-#endif
 
 
 #if defined(JBD_PARANOID_IOFAIL)
 #if defined(JBD_PARANOID_IOFAIL)
 #define J_EXPECT(expr, why...)		J_ASSERT(expr)
 #define J_EXPECT(expr, why...)		J_ASSERT(expr)

+ 0 - 11
include/linux/jbd2.h

@@ -284,19 +284,8 @@ typedef struct journal_superblock_s
 
 
 #define J_ASSERT(assert)	BUG_ON(!(assert))
 #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_BH(bh, expr)	J_ASSERT(expr)
 #define J_ASSERT_JH(jh, expr)	J_ASSERT(expr)
 #define J_ASSERT_JH(jh, expr)	J_ASSERT(expr)
-#endif
 
 
 #if defined(JBD2_PARANOID_IOFAIL)
 #if defined(JBD2_PARANOID_IOFAIL)
 #define J_EXPECT(expr, why...)		J_ASSERT(expr)
 #define J_EXPECT(expr, why...)		J_ASSERT(expr)