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>
This commit is contained in:
committed by
Theodore Ts'o
parent
af1e76d6b3
commit
a5005da204
+1
-10
@@ -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
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user