diff for duplicates of <20100713102014.2835.75027.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index 79ed618..2a00142 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,9 +32,3 @@ index 52b051f..bdcbc14 100644 return err; -- 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 6528072..5c916f8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -49,12 +49,6 @@ " \tif (err)\n" " \t\treturn err;\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 -97d1a07684f1cd3cfbda0d8180d0f2e6bc3932ce9e78ce9a090febbc48a2ab79 +ce5d299077109395cc8b924b1d8c8b421377f4e22aacb4426d833064d728e6c3
diff --git a/a/1.txt b/N2/1.txt index 79ed618..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,40 +1 @@ ->From b0240dd1e2ee0b4dc30f98c67cfe35e8c1833753 Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Tue, 13 Jul 2010 11:36:53 +0800 -Subject: [PATCH 18/30] netvm: filter emergency skbs. -Toss all emergency packets not for a SOCK_MEMALLOC socket. This ensures our -precious memory reserve doesn't get stuck waiting for user-space. - -The correctness of this approach relies on the fact that networks must be -assumed lossy. - -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/core/filter.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/net/core/filter.c b/net/core/filter.c -index 52b051f..bdcbc14 100644 ---- a/net/core/filter.c -+++ b/net/core/filter.c -@@ -82,6 +82,9 @@ int sk_filter(struct sock *sk, struct sk_buff *skb) - int err; - struct sk_filter *filter; - -+ if (skb_emergency(skb) && !sk_has_memalloc(sk)) -+ return -ENOMEM; -+ - err = security_sock_rcv_skb(sk, skb); - if (err) - return err; --- -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 6528072..0680066 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,45 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From b0240dd1e2ee0b4dc30f98c67cfe35e8c1833753 Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Tue, 13 Jul 2010 11:36:53 +0800\n" - "Subject: [PATCH 18/30] netvm: filter emergency skbs.\n" - "\n" - "Toss all emergency packets not for a SOCK_MEMALLOC socket. This ensures our\n" - "precious memory reserve doesn't get stuck waiting for user-space.\n" - "\n" - "The correctness of this approach relies on the fact that networks must be\n" - "assumed lossy.\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/core/filter.c | 3 +++\n" - " 1 files changed, 3 insertions(+), 0 deletions(-)\n" - "\n" - "diff --git a/net/core/filter.c b/net/core/filter.c\n" - "index 52b051f..bdcbc14 100644\n" - "--- a/net/core/filter.c\n" - "+++ b/net/core/filter.c\n" - "@@ -82,6 +82,9 @@ int sk_filter(struct sock *sk, struct sk_buff *skb)\n" - " \tint err;\n" - " \tstruct sk_filter *filter;\n" - " \n" - "+\tif (skb_emergency(skb) && !sk_has_memalloc(sk))\n" - "+\t\treturn -ENOMEM;\n" - "+\n" - " \terr = security_sock_rcv_skb(sk, skb);\n" - " \tif (err)\n" - " \t\treturn err;\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>" -97d1a07684f1cd3cfbda0d8180d0f2e6bc3932ce9e78ce9a090febbc48a2ab79 +5c60a616197add779edac739502ceb5ca17a3f24f760af3063d34f2d57f612cd
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.