Merge "mm: page_alloc: avoid fatal sig check for GFP_NOFS"

This commit is contained in:
qctecmdr 2020-09-14 20:12:26 -07:00 • committed by Gerrit - the friendly Code Review server
commit f0921de704

View file

@ -4692,7 +4692,8 @@ retry:
if (current->flags & PF_MEMALLOC)
goto nopage;
if (fatal_signal_pending(current) && !(gfp_mask & __GFP_NOFAIL))
if (fatal_signal_pending(current) && !(gfp_mask & __GFP_NOFAIL) &&
(gfp_mask & __GFP_FS))
goto nopage;
/* Try direct reclaim and then allocating */