diff for duplicates of <20160203104136.GA517@swordfish> diff --git a/a/1.txt b/N1/1.txt index d6b9f00..3928083 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,40 +19,3 @@ for example, as a -fix, then I wouldn't mind at all. a better commit message ===8<====8<==== - -From 1d6315221f2f81c53c99f9980158f8ae49dbd582 Mon Sep 17 00:00:00 2001 -From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> -Date: Wed, 3 Feb 2016 18:49:16 +0900 -Subject: [PATCH] mm/workingset: do not forget to unlock_page in workingset_activation - -Do not return from workingset_activation() with locked rcu and page. - -Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> ---- - mm/workingset.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mm/workingset.c b/mm/workingset.c -index 14522ed..54138a9 100644 ---- a/mm/workingset.c -+++ b/mm/workingset.c -@@ -315,8 +315,10 @@ void workingset_activation(struct page *page) - * XXX: See workingset_refault() - this should return - * root_mem_cgroup even for !CONFIG_MEMCG. - */ -- if (!mem_cgroup_disabled() && !page_memcg(page)) -+ if (!mem_cgroup_disabled() && !page_memcg(page)) { -+ unlock_page_memcg(page); - return; -+ } - lruvec = mem_cgroup_zone_lruvec(page_zone(page), page_memcg(page)); - atomic_long_inc(&lruvec->inactive_age); - unlock_page_memcg(page); --- -2.7.0 - --- -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 c103ca8..1dfa7df 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -33,43 +33,6 @@ "\n" "\n" "a better commit message\n" - "===8<====8<====\n" - "\n" - "From 1d6315221f2f81c53c99f9980158f8ae49dbd582 Mon Sep 17 00:00:00 2001\n" - "From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>\n" - "Date: Wed, 3 Feb 2016 18:49:16 +0900\n" - "Subject: [PATCH] mm/workingset: do not forget to unlock_page in workingset_activation\n" - "\n" - "Do not return from workingset_activation() with locked rcu and page.\n" - "\n" - "Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>\n" - "---\n" - " mm/workingset.c | 4 +++-\n" - " 1 file changed, 3 insertions(+), 1 deletion(-)\n" - "\n" - "diff --git a/mm/workingset.c b/mm/workingset.c\n" - "index 14522ed..54138a9 100644\n" - "--- a/mm/workingset.c\n" - "+++ b/mm/workingset.c\n" - "@@ -315,8 +315,10 @@ void workingset_activation(struct page *page)\n" - " \t * XXX: See workingset_refault() - this should return\n" - " \t * root_mem_cgroup even for !CONFIG_MEMCG.\n" - " \t */\n" - "-\tif (!mem_cgroup_disabled() && !page_memcg(page))\n" - "+\tif (!mem_cgroup_disabled() && !page_memcg(page)) {\n" - "+\t\tunlock_page_memcg(page);\n" - " \t\treturn;\n" - "+\t}\n" - " \tlruvec = mem_cgroup_zone_lruvec(page_zone(page), page_memcg(page));\n" - " \tatomic_long_inc(&lruvec->inactive_age);\n" - " \tunlock_page_memcg(page);\n" - "-- \n" - "2.7.0\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>" + ===8<====8<==== -be1f2754cc28c7b848d57d6b63065497e3de6ac682618c1766038afe5655e8b6 +aab329129b29f02f97fc609713c52561a86c5a716ab7192cf904bc42cc267564
diff --git a/a/1.txt b/N2/1.txt index d6b9f00..28f10c6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -20,7 +20,7 @@ for example, as a -fix, then I wouldn't mind at all. a better commit message ===8<====8<==== -From 1d6315221f2f81c53c99f9980158f8ae49dbd582 Mon Sep 17 00:00:00 2001 +>From 1d6315221f2f81c53c99f9980158f8ae49dbd582 Mon Sep 17 00:00:00 2001 From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Date: Wed, 3 Feb 2016 18:49:16 +0900 Subject: [PATCH] mm/workingset: do not forget to unlock_page in workingset_activation @@ -50,9 +50,3 @@ index 14522ed..54138a9 100644 unlock_page_memcg(page); -- 2.7.0 - --- -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 c103ca8..c99f40e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -35,7 +35,7 @@ "a better commit message\n" "===8<====8<====\n" "\n" - "From 1d6315221f2f81c53c99f9980158f8ae49dbd582 Mon Sep 17 00:00:00 2001\n" + ">From 1d6315221f2f81c53c99f9980158f8ae49dbd582 Mon Sep 17 00:00:00 2001\n" "From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>\n" "Date: Wed, 3 Feb 2016 18:49:16 +0900\n" "Subject: [PATCH] mm/workingset: do not forget to unlock_page in workingset_activation\n" @@ -64,12 +64,6 @@ " \tatomic_long_inc(&lruvec->inactive_age);\n" " \tunlock_page_memcg(page);\n" "-- \n" - "2.7.0\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>" + 2.7.0 -be1f2754cc28c7b848d57d6b63065497e3de6ac682618c1766038afe5655e8b6 +d6e78ea7b2fd5465e4ce11bb7ca66118b8f3cde750513af38dd3c4b4a340893d
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.