From: Christoph Lameter Replace jbd_kmalloc with kmalloc directly. Signed-off-by: Christoph Lameter Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton --- fs/jbd/checkpoint.c | 2 +- fs/jbd/journal.c | 12 ++++++------ fs/jbd/transaction.c | 6 +++--- fs/jbd2/checkpoint.c | 2 +- fs/jbd2/journal.c | 12 ++++++------ fs/jbd2/transaction.c | 6 +++--- include/linux/jbd.h | 15 --------------- include/linux/jbd2.h | 15 --------------- 8 files changed, 20 insertions(+), 50 deletions(-) diff -puN fs/jbd/checkpoint.c~jbd-slab-cleanups-2 fs/jbd/checkpoint.c --- a/fs/jbd/checkpoint.c~jbd-slab-cleanups-2 +++ a/fs/jbd/checkpoint.c @@ -693,5 +693,5 @@ void __journal_drop_transaction(journal_ J_ASSERT(journal->j_running_transaction != transaction); jbd_debug(1, "Dropping transaction %d, all done\n", transaction->t_tid); - jbd_kfree(transaction); + kfree(transaction); } diff -puN fs/jbd/journal.c~jbd-slab-cleanups-2 fs/jbd/journal.c --- a/fs/jbd/journal.c~jbd-slab-cleanups-2 +++ a/fs/jbd/journal.c @@ -653,7 +653,7 @@ static journal_t * journal_init_common ( journal_t *journal; int err; - journal = jbd_kmalloc(sizeof(*journal), GFP_KERNEL); + journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL); if (!journal) goto fail; memset(journal, 0, sizeof(*journal)); @@ -678,7 +678,7 @@ static journal_t * journal_init_common ( /* Set up a default-sized revoke table for the new mount. */ err = journal_init_revoke(journal, JOURNAL_REVOKE_DEFAULT_HASH); if (err) { - jbd_kfree(journal); + kfree(journal); goto fail; } return journal; @@ -727,7 +727,7 @@ journal_t * journal_init_dev(struct bloc if (!journal->j_wbuf) { printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", __FUNCTION__); - jbd_kfree(journal); + kfree(journal); journal = NULL; goto out; } @@ -781,7 +781,7 @@ journal_t * journal_init_inode (struct i if (!journal->j_wbuf) { printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", __FUNCTION__); - jbd_kfree(journal); + kfree(journal); return NULL; } @@ -790,7 +790,7 @@ journal_t * journal_init_inode (struct i if (err) { printk(KERN_ERR "%s: Cannnot locate journal superblock\n", __FUNCTION__); - jbd_kfree(journal); + kfree(journal); return NULL; } @@ -1158,7 +1158,7 @@ void journal_destroy(journal_t *journal) if (journal->j_revoke) journal_destroy_revoke(journal); kfree(journal->j_wbuf); - jbd_kfree(journal); + kfree(journal); } diff -puN fs/jbd/transaction.c~jbd-slab-cleanups-2 fs/jbd/transaction.c --- a/fs/jbd/transaction.c~jbd-slab-cleanups-2 +++ a/fs/jbd/transaction.c @@ -96,8 +96,8 @@ static int start_this_handle(journal_t * alloc_transaction: if (!journal->j_running_transaction) { - new_transaction = jbd_kmalloc(sizeof(*new_transaction), - GFP_NOFS); + new_transaction = kmalloc(sizeof(*new_transaction), + GFP_NOFS|__GFP_NOFAIL); if (!new_transaction) { ret = -ENOMEM; goto out; @@ -229,7 +229,7 @@ repeat_locked: spin_unlock(&journal->j_state_lock); out: if (unlikely(new_transaction)) /* It's usually NULL */ - jbd_kfree(new_transaction); + kfree(new_transaction); return ret; } diff -puN fs/jbd2/checkpoint.c~jbd-slab-cleanups-2 fs/jbd2/checkpoint.c --- a/fs/jbd2/checkpoint.c~jbd-slab-cleanups-2 +++ a/fs/jbd2/checkpoint.c @@ -693,5 +693,5 @@ void __jbd2_journal_drop_transaction(jou J_ASSERT(journal->j_running_transaction != transaction); jbd_debug(1, "Dropping transaction %d, all done\n", transaction->t_tid); - jbd2_kfree(transaction); + kfree(transaction); } diff -puN fs/jbd2/journal.c~jbd-slab-cleanups-2 fs/jbd2/journal.c --- a/fs/jbd2/journal.c~jbd-slab-cleanups-2 +++ a/fs/jbd2/journal.c @@ -654,7 +654,7 @@ static journal_t * journal_init_common ( journal_t *journal; int err; - journal = jbd2_kmalloc(sizeof(*journal), GFP_KERNEL); + journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL); if (!journal) goto fail; memset(journal, 0, sizeof(*journal)); @@ -679,7 +679,7 @@ static journal_t * journal_init_common ( /* Set up a default-sized revoke table for the new mount. */ err = jbd2_journal_init_revoke(journal, JOURNAL_REVOKE_DEFAULT_HASH); if (err) { - jbd2_kfree(journal); + kfree(journal); goto fail; } return journal; @@ -728,7 +728,7 @@ journal_t * jbd2_journal_init_dev(struct if (!journal->j_wbuf) { printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", __FUNCTION__); - jbd2_kfree(journal); + kfree(journal); journal = NULL; goto out; } @@ -782,7 +782,7 @@ journal_t * jbd2_journal_init_inode (str if (!journal->j_wbuf) { printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", __FUNCTION__); - jbd2_kfree(journal); + kfree(journal); return NULL; } @@ -791,7 +791,7 @@ journal_t * jbd2_journal_init_inode (str if (err) { printk(KERN_ERR "%s: Cannnot locate journal superblock\n", __FUNCTION__); - jbd2_kfree(journal); + kfree(journal); return NULL; } @@ -1159,7 +1159,7 @@ void jbd2_journal_destroy(journal_t *jou if (journal->j_revoke) jbd2_journal_destroy_revoke(journal); kfree(journal->j_wbuf); - jbd2_kfree(journal); + kfree(journal); } diff -puN fs/jbd2/transaction.c~jbd-slab-cleanups-2 fs/jbd2/transaction.c --- a/fs/jbd2/transaction.c~jbd-slab-cleanups-2 +++ a/fs/jbd2/transaction.c @@ -96,8 +96,8 @@ static int start_this_handle(journal_t * alloc_transaction: if (!journal->j_running_transaction) { - new_transaction = jbd2_kmalloc(sizeof(*new_transaction), - GFP_NOFS); + new_transaction = kmalloc(sizeof(*new_transaction), + GFP_NOFS|__GFP_NOFAIL); if (!new_transaction) { ret = -ENOMEM; goto out; @@ -229,7 +229,7 @@ repeat_locked: spin_unlock(&journal->j_state_lock); out: if (unlikely(new_transaction)) /* It's usually NULL */ - jbd2_kfree(new_transaction); + kfree(new_transaction); return ret; } diff -puN include/linux/jbd.h~jbd-slab-cleanups-2 include/linux/jbd.h --- a/include/linux/jbd.h~jbd-slab-cleanups-2 +++ a/include/linux/jbd.h @@ -71,16 +71,6 @@ extern int journal_enable_debug; #define jbd_debug(f, a...) /**/ #endif -static inline void *__jbd_kmalloc(const char *where, size_t size, - gfp_t flags, int retry) -{ - return kmalloc(size, flags | (retry ? __GFP_NOFAIL : 0)); -} - -static inline void jbd_kfree(void *ptr) -{ - return kfree(ptr); -} static inline void *jbd_alloc(size_t size, gfp_t flags) { @@ -92,11 +82,6 @@ static inline void jbd_free(void *ptr, s free_pages((unsigned long)ptr, get_order(size)); }; -#define jbd_kmalloc(size, flags) \ - __jbd_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry) -#define jbd_rep_kmalloc(size, flags) \ - __jbd_kmalloc(__FUNCTION__, (size), (flags), 1) - #define JFS_MIN_JOURNAL_BLOCKS 1024 #ifdef __KERNEL__ diff -puN include/linux/jbd2.h~jbd-slab-cleanups-2 include/linux/jbd2.h --- a/include/linux/jbd2.h~jbd-slab-cleanups-2 +++ a/include/linux/jbd2.h @@ -71,16 +71,6 @@ extern u8 jbd2_journal_enable_debug; #define jbd_debug(f, a...) /**/ #endif -static inline void *__jbd2_kmalloc(const char *where, size_t size, - gfp_t flags, int retry) -{ - return kmalloc(size, flags | (retry ? __GFP_NOFAIL : 0)); -} -static inline void jbd2_kfree(void *ptr) -{ - return kfree(ptr); -} - static inline void *jbd2_alloc(size_t size, gfp_t flags) { return (void *)__get_free_pages(flags, get_order(size)); @@ -91,11 +81,6 @@ static inline void jbd2_free(void *ptr, free_pages((unsigned long)ptr, get_order(size)); }; -#define jbd2_kmalloc(size, flags) \ - __jbd2_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry) -#define jbd_rep_kmalloc(size, flags) \ - __jbd2_kmalloc(__FUNCTION__, (size), (flags), 1) - #define JBD2_MIN_JOURNAL_BLOCKS 1024 #ifdef __KERNEL__ _