The patch titled jbd: remove dependency on __GFP_NOFAIL has been removed from the -mm tree. Its filename was jbd-remove-dependency-on-__gfp_nofail.patch This patch was dropped because an alternative patch was merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: jbd: remove dependency on __GFP_NOFAIL From: David Rientjes <rientjes@xxxxxxxxxx> The kzalloc() in start_this_handle() is failable, so remove __GFP_NOFAIL from its mask. If this is in the direct reclaim path, then current has PF_MEMALLOC which allows it to allocate with memory reserves in lowmem situations. Using GFP_NOFS with __GFP_NOFAIL is always dangerous because the oom killer cannot be invoked for GFP_NOFS, so the potential for infinitely looping in the page allocator is even greater the way it is currently written. Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx> Cc: Andreas Dilger <adilger@xxxxxxx> Cc: Jiri Kosina <jkosina@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/jbd/transaction.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN fs/jbd/transaction.c~jbd-remove-dependency-on-__gfp_nofail fs/jbd/transaction.c --- a/fs/jbd/transaction.c~jbd-remove-dependency-on-__gfp_nofail +++ a/fs/jbd/transaction.c @@ -99,8 +99,7 @@ static int start_this_handle(journal_t * alloc_transaction: if (!journal->j_running_transaction) { - new_transaction = kzalloc(sizeof(*new_transaction), - GFP_NOFS|__GFP_NOFAIL); + new_transaction = kzalloc(sizeof(*new_transaction), GFP_NOFS); if (!new_transaction) { ret = -ENOMEM; goto out; _ Patches currently in -mm which might be from rientjes@xxxxxxxxxx are origin.patch mm-increase-reclaim_distance-to-30.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-fix-2.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-cpusets-initialize-spread-rotor-lazily.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-cpusets-initialize-spread-rotor-lazily-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html