From 2d917969bc8dbde45900f5cbc2558e2cf1f8ec32 Mon Sep 17 00:00:00 2001 From: Mingming Cao Date: Tue, 16 Oct 2007 18:38:25 -0400 Subject: JBD2: replace jbd_kmalloc with kmalloc directly. This patch cleans up jbd_kmalloc and replace it with kmalloc directly Signed-off-by: Mingming Cao --- fs/jbd2/journal.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'fs/jbd2/journal.c') diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 2d9ecca74f1..0e329a31c91 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -654,7 +654,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)); @@ -1618,15 +1618,6 @@ size_t journal_tag_bytes(journal_t *journal) return JBD_TAG_SIZE32; } -/* - * Simple support for retrying memory allocations. Introduced to help to - * debug different VM deadlock avoidance strategies. - */ -void * __jbd2_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