From 8c603397d9c136e7f9d19bd8db2b58e165bdfb6b Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 14 Mar 2013 03:29:40 +0000 Subject: [PATCH] --- yaml --- r: 361444 b: refs/heads/master c: cca7af3889bfa343d33d5e657a38d876abd10e58 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 61cc5d4e4afb..ce106e99fb3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16fad69cfe4adbbfa813de516757b87bcae36d93 +refs/heads/master: cca7af3889bfa343d33d5e657a38d876abd10e58 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 6f2bb860e051..441f5bfdab8e 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -1288,11 +1288,13 @@ static inline void __skb_fill_page_desc(struct sk_buff *skb, int i, * do not lose pfmemalloc information as the pages would not be * allocated using __GFP_MEMALLOC. */ - if (page->pfmemalloc && !page->mapping) - skb->pfmemalloc = true; frag->page.p = page; frag->page_offset = off; skb_frag_size_set(frag, size); + + page = compound_head(page); + if (page->pfmemalloc && !page->mapping) + skb->pfmemalloc = true; } /**