diff options
Diffstat (limited to 'include/linux/jbd.h')
-rw-r--r-- | include/linux/jbd.h | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 72f522372924..16e7ed855a18 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
@@ -58,7 +58,7 @@ | |||
58 | * CONFIG_JBD_DEBUG is on. | 58 | * CONFIG_JBD_DEBUG is on. |
59 | */ | 59 | */ |
60 | #define JBD_EXPENSIVE_CHECKING | 60 | #define JBD_EXPENSIVE_CHECKING |
61 | extern int journal_enable_debug; | 61 | extern u8 journal_enable_debug; |
62 | 62 | ||
63 | #define jbd_debug(n, f, a...) \ | 63 | #define jbd_debug(n, f, a...) \ |
64 | do { \ | 64 | do { \ |
@@ -72,14 +72,15 @@ extern int journal_enable_debug; | |||
72 | #define jbd_debug(f, a...) /**/ | 72 | #define jbd_debug(f, a...) /**/ |
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | extern void * __jbd_kmalloc (const char *where, size_t size, gfp_t flags, int retry); | 75 | static inline void *jbd_alloc(size_t size, gfp_t flags) |
76 | extern void * jbd_slab_alloc(size_t size, gfp_t flags); | 76 | { |
77 | extern void jbd_slab_free(void *ptr, size_t size); | 77 | return (void *)__get_free_pages(flags, get_order(size)); |
78 | } | ||
78 | 79 | ||
79 | #define jbd_kmalloc(size, flags) \ | 80 | static inline void jbd_free(void *ptr, size_t size) |
80 | __jbd_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry) | 81 | { |
81 | #define jbd_rep_kmalloc(size, flags) \ | 82 | free_pages((unsigned long)ptr, get_order(size)); |
82 | __jbd_kmalloc(__FUNCTION__, (size), (flags), 1) | 83 | }; |
83 | 84 | ||
84 | #define JFS_MIN_JOURNAL_BLOCKS 1024 | 85 | #define JFS_MIN_JOURNAL_BLOCKS 1024 |
85 | 86 | ||
@@ -247,17 +248,7 @@ typedef struct journal_superblock_s | |||
247 | #include <linux/fs.h> | 248 | #include <linux/fs.h> |
248 | #include <linux/sched.h> | 249 | #include <linux/sched.h> |
249 | 250 | ||
250 | #define JBD_ASSERTIONS | 251 | #define J_ASSERT(assert) BUG_ON(!(assert)) |
251 | #ifdef JBD_ASSERTIONS | ||
252 | #define J_ASSERT(assert) \ | ||
253 | do { \ | ||
254 | if (!(assert)) { \ | ||
255 | printk (KERN_EMERG \ | ||
256 | "Assertion failure in %s() at %s:%d: \"%s\"\n", \ | ||
257 | __FUNCTION__, __FILE__, __LINE__, # assert); \ | ||
258 | BUG(); \ | ||
259 | } \ | ||
260 | } while (0) | ||
261 | 252 | ||
262 | #if defined(CONFIG_BUFFER_DEBUG) | 253 | #if defined(CONFIG_BUFFER_DEBUG) |
263 | void buffer_assertion_failure(struct buffer_head *bh); | 254 | void buffer_assertion_failure(struct buffer_head *bh); |
@@ -273,10 +264,6 @@ void buffer_assertion_failure(struct buffer_head *bh); | |||
273 | #define J_ASSERT_JH(jh, expr) J_ASSERT(expr) | 264 | #define J_ASSERT_JH(jh, expr) J_ASSERT(expr) |
274 | #endif | 265 | #endif |
275 | 266 | ||
276 | #else | ||
277 | #define J_ASSERT(assert) do { } while (0) | ||
278 | #endif /* JBD_ASSERTIONS */ | ||
279 | |||
280 | #if defined(JBD_PARANOID_IOFAIL) | 267 | #if defined(JBD_PARANOID_IOFAIL) |
281 | #define J_EXPECT(expr, why...) J_ASSERT(expr) | 268 | #define J_EXPECT(expr, why...) J_ASSERT(expr) |
282 | #define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr) | 269 | #define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr) |