From 8b84283fef7478a4206b736b90b9cd68db6c41b6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 22 Nov 2005 21:58:37 -0800
Subject: [PATCH] --- yaml --- r: 14639 b: refs/heads/master c:
 1778d55edb62753a92b979fa57072c2e1ff3d062 h: refs/heads/master i:   14637:
 09b268d41ad1f316423a3df51138562c771bfc59   14635:
 bcfb347ac12ce908a1e48a0b3bbea58b29c78fcb   14631:
 a9944c6aace6fb89d4d726282ea5cb2c9c3484b0   14623:
 80d473d5f8360ee52090ca441374d91b55877317 v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/jbd.h | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index a59a69680a66..c0e020087200 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac3461ad632e86e7debd871776683c05ef3ba4c6
+refs/heads/master: 1778d55edb62753a92b979fa57072c2e1ff3d062
diff --git a/trunk/include/linux/jbd.h b/trunk/include/linux/jbd.h
index aa56172c6fed..dcde7adfdce5 100644
--- a/trunk/include/linux/jbd.h
+++ b/trunk/include/linux/jbd.h
@@ -16,8 +16,6 @@
 #ifndef _LINUX_JBD_H
 #define _LINUX_JBD_H
 
-#if defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE) || !defined(__KERNEL__)
-
 /* Allow this file to be included directly into e2fsprogs */
 #ifndef __KERNEL__
 #include "jfs_compat.h"
@@ -1083,19 +1081,4 @@ extern int jbd_blocks_per_page(struct inode *inode);
 
 #endif	/* __KERNEL__ */
 
-#endif	/* CONFIG_JBD || CONFIG_JBD_MODULE || !__KERNEL__ */
-
-/*
- * Compatibility no-ops which allow the kernel to compile without CONFIG_JBD
- * go here.
- */
-
-#if defined(__KERNEL__) && !(defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE))
-
-#define J_ASSERT(expr)			do {} while (0)
-#define J_ASSERT_BH(bh, expr)		do {} while (0)
-#define buffer_jbd(bh)			0
-#define journal_buffer_journal_lru(bh)	0
-
-#endif	/* defined(__KERNEL__) && !defined(CONFIG_JBD) */
 #endif	/* _LINUX_JBD_H */