aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd/journal.c
diff options
context:
space:
mode:
authorMingming Cao <cmm@us.ibm.com>2007-10-16 18:38:25 -0400
committerTheodore Ts'o <tytso@mit.edu>2007-10-17 18:49:57 -0400
commita5005da204289ce01ca37be59e902100ef247a4d (patch)
tree4f754d5936a3b8b2d462a343bdd2342967170ac8 /fs/jbd/journal.c
parentaf1e76d6b3f37cb89d9192eaf83588adaf4728eb (diff)
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>
Diffstat (limited to 'fs/jbd/journal.c')
-rw-r--r--fs/jbd/journal.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 7edf3fdfdad..65c29047066 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -653,7 +653,7 @@ static journal_t * journal_init_common (void)
653 journal_t *journal; 653 journal_t *journal;
654 int err; 654 int err;
655 655
656 journal = jbd_kmalloc(sizeof(*journal), GFP_KERNEL); 656 journal = kmalloc(sizeof(*journal), GFP_KERNEL);
657 if (!journal) 657 if (!journal)
658 goto fail; 658 goto fail;
659 memset(journal, 0, sizeof(*journal)); 659 memset(journal, 0, sizeof(*journal));
@@ -1607,15 +1607,6 @@ int journal_blocks_per_page(struct inode *inode)
1607} 1607}
1608 1608
1609/* 1609/*
1610 * Simple support for retrying memory allocations. Introduced to help to
1611 * debug different VM deadlock avoidance strategies.
1612 */
1613void * __jbd_kmalloc (const char *where, size_t size, gfp_t flags, int retry)
1614{
1615 return kmalloc(size, flags | (retry ? __GFP_NOFAIL : 0));
1616}
1617
1618/*
1619 * Journal_head storage management 1610 * Journal_head storage management
1620 */ 1611 */
1621static struct kmem_cache *journal_head_cache; 1612static struct kmem_cache *journal_head_cache;