diff options
-rw-r--r-- | include/linux/jbd.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index aa56172c6fed..dcde7adfdce5 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
@@ -16,8 +16,6 @@ | |||
16 | #ifndef _LINUX_JBD_H | 16 | #ifndef _LINUX_JBD_H |
17 | #define _LINUX_JBD_H | 17 | #define _LINUX_JBD_H |
18 | 18 | ||
19 | #if defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE) || !defined(__KERNEL__) | ||
20 | |||
21 | /* Allow this file to be included directly into e2fsprogs */ | 19 | /* Allow this file to be included directly into e2fsprogs */ |
22 | #ifndef __KERNEL__ | 20 | #ifndef __KERNEL__ |
23 | #include "jfs_compat.h" | 21 | #include "jfs_compat.h" |
@@ -1083,19 +1081,4 @@ extern int jbd_blocks_per_page(struct inode *inode); | |||
1083 | 1081 | ||
1084 | #endif /* __KERNEL__ */ | 1082 | #endif /* __KERNEL__ */ |
1085 | 1083 | ||
1086 | #endif /* CONFIG_JBD || CONFIG_JBD_MODULE || !__KERNEL__ */ | ||
1087 | |||
1088 | /* | ||
1089 | * Compatibility no-ops which allow the kernel to compile without CONFIG_JBD | ||
1090 | * go here. | ||
1091 | */ | ||
1092 | |||
1093 | #if defined(__KERNEL__) && !(defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE)) | ||
1094 | |||
1095 | #define J_ASSERT(expr) do {} while (0) | ||
1096 | #define J_ASSERT_BH(bh, expr) do {} while (0) | ||
1097 | #define buffer_jbd(bh) 0 | ||
1098 | #define journal_buffer_journal_lru(bh) 0 | ||
1099 | |||
1100 | #endif /* defined(__KERNEL__) && !defined(CONFIG_JBD) */ | ||
1101 | #endif /* _LINUX_JBD_H */ | 1084 | #endif /* _LINUX_JBD_H */ |