diff for duplicates of <20100713102036.2835.36872.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index b06be60..5944c98 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,9 +33,3 @@ index 78b505d..cc04549 100644 goto next_hook; -- 1.7.1.1 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 7528abc..ba4e884 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -50,12 +50,6 @@ " \t\t\t verdict >> NF_VERDICT_BITS))\n" " \t\t\tgoto next_hook;\n" "-- \n" - "1.7.1.1\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + 1.7.1.1 -2f082fdd0ea59b505100c1a5ca26f80919c29df3364ebf32f8c21e34ff0c6b7c +0428bd1749625d46ec8f1697aa1f92e1ed31d0cd6a35419cc0b54268de49dfda
diff --git a/a/1.txt b/N2/1.txt index b06be60..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,41 +1 @@ ->From 6c5ccad4c45a73a6d9ebecbfcb1bce8ff3ca462f Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Tue, 13 Jul 2010 11:38:29 +0800 -Subject: [PATCH 20/30] netfilter: NF_QUEUE vs emergency skbs -Avoid memory getting stuck waiting for userspace, drop all emergency packets. -This of course requires the regular storage route to not include an NF_QUEUE -target ;-) - -Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> -Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> -Signed-off-by: Xiaotian Feng <dfeng@redhat.com> ---- - net/netfilter/core.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/net/netfilter/core.c b/net/netfilter/core.c -index 78b505d..cc04549 100644 ---- a/net/netfilter/core.c -+++ b/net/netfilter/core.c -@@ -176,9 +176,12 @@ next_hook: - if (verdict == NF_ACCEPT || verdict == NF_STOP) { - ret = 1; - } else if (verdict == NF_DROP) { -+drop: - kfree_skb(skb); - ret = -EPERM; - } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) { -+ if (skb_emergency(skb)) -+ goto drop; - if (!nf_queue(skb, elem, pf, hook, indev, outdev, okfn, - verdict >> NF_VERDICT_BITS)) - goto next_hook; --- -1.7.1.1 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index 7528abc..d806b18 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,46 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From 6c5ccad4c45a73a6d9ebecbfcb1bce8ff3ca462f Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Tue, 13 Jul 2010 11:38:29 +0800\n" - "Subject: [PATCH 20/30] netfilter: NF_QUEUE vs emergency skbs\n" - "\n" - "Avoid memory getting stuck waiting for userspace, drop all emergency packets.\n" - "This of course requires the regular storage route to not include an NF_QUEUE\n" - "target ;-)\n" - "\n" - "Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>\n" - "Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>\n" - "Signed-off-by: Xiaotian Feng <dfeng@redhat.com>\n" - "---\n" - " net/netfilter/core.c | 3 +++\n" - " 1 files changed, 3 insertions(+), 0 deletions(-)\n" - "\n" - "diff --git a/net/netfilter/core.c b/net/netfilter/core.c\n" - "index 78b505d..cc04549 100644\n" - "--- a/net/netfilter/core.c\n" - "+++ b/net/netfilter/core.c\n" - "@@ -176,9 +176,12 @@ next_hook:\n" - " \tif (verdict == NF_ACCEPT || verdict == NF_STOP) {\n" - " \t\tret = 1;\n" - " \t} else if (verdict == NF_DROP) {\n" - "+drop:\n" - " \t\tkfree_skb(skb);\n" - " \t\tret = -EPERM;\n" - " \t} else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {\n" - "+\t\tif (skb_emergency(skb))\n" - "+\t\t\tgoto drop;\n" - " \t\tif (!nf_queue(skb, elem, pf, hook, indev, outdev, okfn,\n" - " \t\t\t verdict >> NF_VERDICT_BITS))\n" - " \t\t\tgoto next_hook;\n" - "-- \n" - "1.7.1.1\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -2f082fdd0ea59b505100c1a5ca26f80919c29df3364ebf32f8c21e34ff0c6b7c +4a073abbcfaa35525640e5300d1c4891e52b25ccf77105cc0531e084417c16ee
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.