diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2017-04-17 01:34:58 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-18 17:13:57 +1000 |
| commit | ad9e66f699c5c15c9bac38eca1ab4e08edc0d4b3 (patch) | |
| tree | 21263b0a1410809278a220ba3687a45bfb6e639d | |
| parent | e609ffe0f0f2820567802ba34b8bf1d98e147714 (diff) | |
treewide-convert-pf_memalloc-manipulations-to-new-helpers-fix
In net/core/sock.c the hunk is missing (that didn't involve
tsk_restore_flags()).
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | net/core/sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 3a5adc4baf05..79c6aee6af9b 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -373,14 +373,14 @@ EXPORT_SYMBOL_GPL(sk_clear_memalloc); int __sk_backlog_rcv(struct sock *sk, struct sk_buff *skb) { int ret; - unsigned long pflags = current->flags; + unsigned int noreclaim_flag; /* these should have been dropped before queueing */ BUG_ON(!sock_flag(sk, SOCK_MEMALLOC)); - current->flags |= PF_MEMALLOC; + noreclaim_flag = memalloc_noreclaim_save(); ret = sk->sk_backlog_rcv(sk, skb); - current_restore_flags(pflags, PF_MEMALLOC); + memalloc_noreclaim_restore(noreclaim_flag); return ret; } |