From a5005da204289ce01ca37be59e902100ef247a4d Mon Sep 17 00:00:00 2001 From: Mingming Cao Date: Tue, 16 Oct 2007 18:38:25 -0400 Subject: JBD: replace jbd_kmalloc with kmalloc directly This patch cleans up jbd_kmalloc and replace it with kmalloc directly Signed-off-by: Mingming Cao --- fs/jbd/journal.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'fs/jbd/journal.c') 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)); @@ -1606,15 +1606,6 @@ int journal_blocks_per_page(struct inode *inode) return 1 << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits); } -/* - * 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 */ -- cgit v1.2.3