diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 11:40:10 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 11:40:10 +1100 |
commit | a1b40b5b8173245446fd77f7e1f0b03407ad8e7e (patch) | |
tree | cc39e3711f33692ff1288aaa2272942345239676 /include/linux | |
parent | bf10e3045ef61a6c260588bc3a742ac8e422c971 (diff) | |
parent | 3f606d8d43b5e3a3a7bcac8c62eeb3cbab0c87f2 (diff) |
Merge remote branch 'ext4/next'
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/jbd2.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 4cf619161ed0..1ec876358180 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -69,15 +69,8 @@ extern u8 jbd2_journal_enable_debug; #define jbd_debug(f, a...) /**/ #endif -static inline void *jbd2_alloc(size_t size, gfp_t flags) -{ - return (void *)__get_free_pages(flags, get_order(size)); -} - -static inline void jbd2_free(void *ptr, size_t size) -{ - free_pages((unsigned long)ptr, get_order(size)); -}; +extern void *jbd2_alloc(size_t size, gfp_t flags); +extern void jbd2_free(void *ptr, size_t size); #define JBD2_MIN_JOURNAL_BLOCKS 1024 |