redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

JBD: replace jbd_kmalloc with kmalloc directly

Browse source 
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:
Mingming Cao 2007-10-16 18:38:25 -04:00 committed by Theodore Ts'o
parent af1e76d6b3
commit a5005da204
3 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/jbd/journal.c
View file

@ -653,7 +653,7 @@ static journal_t * journal_init_common (void)
journal_t *journal; journal_t *journal;
int err; int err;
journal = jbd_kmalloc(sizeof(*journal), GFP_KERNEL); journal = kmalloc(sizeof(*journal), GFP_KERNEL);
if (!journal) if (!journal)
goto fail; goto fail;
memset(journal, 0, sizeof(*journal)); 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); 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 * Journal_head storage management
*/ */

4
fs/jbd/transaction.c
View file

@ -96,8 +96,8 @@ static int start_this_handle(journal_t *journal, handle_t *handle)
alloc_transaction: alloc_transaction:
if (!journal->j_running_transaction) { if (!journal->j_running_transaction) {
new_transaction = jbd_kmalloc(sizeof(*new_transaction), new_transaction = kmalloc(sizeof(*new_transaction),
GFP_NOFS); GFP_NOFS|__GFP_NOFAIL);
if (!new_transaction) { if (!new_transaction) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;

6
include/linux/jbd.h
View file

@ -72,12 +72,6 @@ extern int journal_enable_debug;
#define jbd_debug(f, a...) /**/ #define jbd_debug(f, a...) /**/
#endif #endif
extern void * __jbd_kmalloc (const char *where, size_t size, gfp_t flags, int retry);
#define jbd_kmalloc(size, flags) \
__jbd_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry)
#define jbd_rep_kmalloc(size, flags) \
__jbd_kmalloc(__FUNCTION__, (size), (flags), 1)
static inline void *jbd_alloc(size_t size, gfp_t flags) static inline void *jbd_alloc(size_t size, gfp_t flags)
{ {
return (void *)__get_free_pages(flags, get_order(size)); return (void *)__get_free_pages(flags, get_order(size));