]> err.no Git - linux-2.6/commitdiff
[NETFILTER]: nf_ct_alloc_hashtable(): use __GFP_NOWARN
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 30 Oct 2007 04:41:19 +0000 (21:41 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 30 Oct 2007 05:37:31 +0000 (22:37 -0700)
This allocation is expected to fail and we handle it by fallback to vmalloc().

So don't scare people with nasty messages like
http://bugzilla.kernel.org/show_bug.cgi?id=9190

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_core.c

index 4d6171bc0829cd1e9283718054b86b5af7195cc2..000c2fb462d07996106270e33eadc72fb07718e6 100644 (file)
@@ -999,7 +999,7 @@ struct hlist_head *nf_ct_alloc_hashtable(int *sizep, int *vmalloced)
        *vmalloced = 0;
 
        size = *sizep = roundup(*sizep, PAGE_SIZE / sizeof(struct hlist_head));
-       hash = (void*)__get_free_pages(GFP_KERNEL,
+       hash = (void*)__get_free_pages(GFP_KERNEL|__GFP_NOWARN,
                                       get_order(sizeof(struct hlist_head)
                                                 * size));
        if (!hash) {