From: Mingming Cao Here is the patch to clean up __GFP_NOFAIL flag in jbd/jbd2. In all cases except one handles memory allocation failure so I get rid of those GFP_NOFAIL flags. Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton --- fs/jbd/journal.c | 2 +- fs/jbd/transaction.c | 3 +-- fs/jbd2/journal.c | 2 +- fs/jbd2/transaction.c | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff -puN fs/jbd2/journal.c~jbd-slab-cleanups-3 fs/jbd2/journal.c --- a/fs/jbd2/journal.c~jbd-slab-cleanups-3 +++ a/fs/jbd2/journal.c @@ -654,7 +654,7 @@ static journal_t * journal_init_common ( journal_t *journal; int err; - journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL); + journal = kmalloc(sizeof(*journal), GFP_KERNEL); if (!journal) goto fail; memset(journal, 0, sizeof(*journal)); diff -puN fs/jbd2/transaction.c~jbd-slab-cleanups-3 fs/jbd2/transaction.c --- a/fs/jbd2/transaction.c~jbd-slab-cleanups-3 +++ a/fs/jbd2/transaction.c @@ -96,8 +96,7 @@ static int start_this_handle(journal_t * alloc_transaction: if (!journal->j_running_transaction) { - new_transaction = kmalloc(sizeof(*new_transaction), - GFP_NOFS|__GFP_NOFAIL); + new_transaction = kmalloc(sizeof(*new_transaction), GFP_NOFS); if (!new_transaction) { ret = -ENOMEM; goto out; diff -puN fs/jbd/journal.c~jbd-slab-cleanups-3 fs/jbd/journal.c --- a/fs/jbd/journal.c~jbd-slab-cleanups-3 +++ a/fs/jbd/journal.c @@ -653,7 +653,7 @@ static journal_t * journal_init_common ( journal_t *journal; int err; - journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL); + journal = kmalloc(sizeof(*journal), GFP_KERNEL); if (!journal) goto fail; memset(journal, 0, sizeof(*journal)); diff -puN fs/jbd/transaction.c~jbd-slab-cleanups-3 fs/jbd/transaction.c --- a/fs/jbd/transaction.c~jbd-slab-cleanups-3 +++ a/fs/jbd/transaction.c @@ -96,8 +96,7 @@ static int start_this_handle(journal_t * alloc_transaction: if (!journal->j_running_transaction) { - new_transaction = kmalloc(sizeof(*new_transaction), - GFP_NOFS|__GFP_NOFAIL); + new_transaction = kmalloc(sizeof(*new_transaction), GFP_NOFS); if (!new_transaction) { ret = -ENOMEM; goto out; _