]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
JBD2: replace jbd_kmalloc with kmalloc directly.
authorMingming Cao <cmm@us.ibm.com>
Tue, 16 Oct 2007 22:38:25 +0000 (18:38 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 17 Oct 2007 22:49:57 +0000 (18:49 -0400)
This patch cleans up jbd_kmalloc and replace it with kmalloc directly

Signed-off-by: Mingming Cao <cmm@us.ibm.com>
fs/jbd2/journal.c
fs/jbd2/transaction.c
include/linux/jbd2.h

index 2d9ecca74f19e96f1f6d64a9685a5f7798df5772..0e329a31c912bc36fadbb79f99ba97b03849c746 100644 (file)
@@ -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
  */
index bd047f9af8e7250d5fdf8f1c8a70d93783c5a960..a5fb70fb56211e43bd41b31f67bc942c4261e0f0 100644 (file)
@@ -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;
index e3677929884afa0bfe50e17a6177656460b81db2..5f8b876c6677297e7dd087aafda3fa034f514a80 100644 (file)
@@ -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));