diff options
Diffstat (limited to 'fs/jbd2/journal.c')
| -rw-r--r-- | fs/jbd2/journal.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 2d9ecca74f19..0e329a31c912 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)); @@ -1619,15 +1619,6 @@ size_t journal_tag_bytes(journal_t *journal) } /* - * 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 */ static struct kmem_cache *jbd2_journal_head_cache; |