mirror of https://gitee.com/openkylin/linux.git
JBD2: 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:
parent
a5005da204
commit
2d917969bc
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -96,8 +96,8 @@ static int start_this_handle(journal_t *journal, handle_t *handle)
|
|||
|
||||
alloc_transaction:
|
||||
if (!journal->j_running_transaction) {
|
||||
new_transaction = jbd_kmalloc(sizeof(*new_transaction),
|
||||
GFP_NOFS);
|
||||
new_transaction = kmalloc(sizeof(*new_transaction),
|
||||
GFP_NOFS|__GFP_NOFAIL);
|
||||
if (!new_transaction) {
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
|
|
|
@ -71,13 +71,6 @@ extern u8 jbd2_journal_enable_debug;
|
|||
#define jbd_debug(f, a...) /**/
|
||||
#endif
|
||||
|
||||
extern void * __jbd2_kmalloc (const char *where, size_t size, gfp_t flags, int retry);
|
||||
#define jbd_kmalloc(size, flags) \
|
||||
__jbd2_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry)
|
||||
#define jbd_rep_kmalloc(size, flags) \
|
||||
__jbd2_kmalloc(__FUNCTION__, (size), (flags), 1)
|
||||
|
||||
|
||||
static inline void *jbd2_alloc(size_t size, gfp_t flags)
|
||||
{
|
||||
return (void *)__get_free_pages(flags, get_order(size));
|
||||
|
|
Loading…
Reference in New Issue