diff options
| author | Mingming Cao <cmm@us.ibm.com> | 2007-10-17 00:38:25 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-10-18 00:49:57 +0200 |
| commit | 2d917969bc8dbde45900f5cbc2558e2cf1f8ec32 (patch) | |
| tree | 4478fb3bcaa3d5fcae71cde791f15b7cae0991d8 /fs/jbd2 | |
| parent | JBD: replace jbd_kmalloc with kmalloc directly (diff) | |
| download | linux-2d917969bc8dbde45900f5cbc2558e2cf1f8ec32.tar.xz linux-2d917969bc8dbde45900f5cbc2558e2cf1f8ec32.zip | |
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>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/journal.c | 11 | ||||
| -rw-r--r-- | fs/jbd2/transaction.c | 4 |
2 files changed, 3 insertions, 12 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; diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index bd047f9af8e7..a5fb70fb5621 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -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; |