Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7e8d4d6 authored by Christoph Egger's avatar Christoph Egger Committed by Jan Kara
Browse files

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: default avatarChristoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent e1f5c67a

include/linux/jbd.h

+0 −11
Original line number Diff line number Diff line
@@ -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)

include/linux/jbd2.h

+0 −11
Original line number Diff line number Diff line
@@ -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)