diff options
| author | Mingming Cao <cmm@us.ibm.com> | 2007-10-17 02:38:25 +0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-10-18 02:49:57 +0400 |
| commit | a5005da204289ce01ca37be59e902100ef247a4d (patch) | |
| tree | 4f754d5936a3b8b2d462a343bdd2342967170ac8 | |
| parent | af1e76d6b3f37cb89d9192eaf83588adaf4728eb (diff) | |
| download | linux-a5005da204289ce01ca37be59e902100ef247a4d.tar.xz | |
JBD: replace jbd_kmalloc with kmalloc directly
This patch cleans up jbd_kmalloc and replace it with kmalloc directly
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
| -rw-r--r-- | fs/jbd/journal.c | 11 | ||||
| -rw-r--r-- | fs/jbd/transaction.c | 4 | ||||
| -rw-r--r-- | include/linux/jbd.h | 6 |
3 files changed, 3 insertions, 18 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 7edf3fdfdadd..65c290470664 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -653,7 +653,7 @@ static journal_t * journal_init_common (void) journal_t *journal; int err; - journal = jbd_kmalloc(sizeof(*journal), GFP_KERNEL); + journal = kmalloc(sizeof(*journal), GFP_KERNEL); if (!journal) goto fail; memset(journal, 0, sizeof(*journal)); @@ -1607,15 +1607,6 @@ int journal_blocks_per_page(struct inode *inode) } /* - * Simple support for retrying memory allocations. Introduced to help to - * debug different VM deadlock avoidance strategies. - */ -void * __jbd_kmalloc (const char *where, size_t size, gfp_t flags, int retry) -{ - return kmalloc(size, flags | (retry ? __GFP_NOFAIL : 0)); -} - -/* * Journal_head storage management */ static struct kmem_cache *journal_head_cache; diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index db8404514c92..0282deb8ff2d 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c @@ -96,8 +96,8 @@ static int start_this_handle(journal_t *journal, handle_t *handle) 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; diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 1db3b684f557..a3abf51e488f 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h @@ -72,12 +72,6 @@ extern int journal_enable_debug; #define jbd_debug(f, a...) /**/ #endif -extern void * __jbd_kmalloc (const char *where, size_t size, gfp_t flags, int retry); -#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) - static inline void *jbd_alloc(size_t size, gfp_t flags) { return (void *)__get_free_pages(flags, get_order(size)); |