Commit 1ce0aa80 authored by Jan Kara's avatar Jan Kara

jbd: Revert "jbd: remove dependency on __GFP_NOFAIL"

This reverts commit 05713082. The idea
to remove __GFP_NOFAIL was opposed by Andrew Morton. Although mm guys do
want to get rid of __GFP_NOFAIL users, opencoding the allocation retry
is even worse.

See emails following
http://www.gossamer-threads.com/lists/linux/kernel/1809153#1809153Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 44499602
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/hrtimer.h> #include <linux/hrtimer.h>
#include <linux/backing-dev.h>
static void __journal_temp_unlink_buffer(struct journal_head *jh); static void __journal_temp_unlink_buffer(struct journal_head *jh);
...@@ -100,10 +99,11 @@ static int start_this_handle(journal_t *journal, handle_t *handle) ...@@ -100,10 +99,11 @@ 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 = kzalloc(sizeof(*new_transaction), GFP_NOFS); new_transaction = kzalloc(sizeof(*new_transaction),
GFP_NOFS|__GFP_NOFAIL);
if (!new_transaction) { if (!new_transaction) {
congestion_wait(BLK_RW_ASYNC, HZ/50); ret = -ENOMEM;
goto alloc_transaction; goto out;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment