diff for duplicates of <1462309346.21143.11.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 7dd661a..fa80224 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,28 +6,28 @@ contends on this lock when they access the same swap partition. Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com> --- -A mm/vmscan.c | 63 ++++++++++++++++++++++++++++++++++++++++--------------------- -A 1 file changed, 42 insertions(+), 21 deletions(-) + mm/vmscan.c | 63 ++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index e36d8a7..310e2b2 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1096,38 +1096,59 @@ static unsigned long shrink_anon_page_list(struct list_head *page_list, -A { -A unsigned long nr_reclaimed = 0; -A enum pg_result pg_dispose; + { + unsigned long nr_reclaimed = 0; + enum pg_result pg_dispose; + swp_entry_t swp_entries[SWAP_BATCH]; + struct page *page; + int m, i, k; -A -A while (n > 0) { + + while (n > 0) { - struct page *page; -A int swap_ret = SWAP_SUCCESS; -A + int swap_ret = SWAP_SUCCESS; + - --n; - if (list_empty(swap_pages)) -- A A A A A A A return nr_reclaimed; +- return nr_reclaimed; + m = get_swap_pages(n, swp_entries); + if (!m) + goto no_swap_slots; @@ -40,10 +40,10 @@ A + return nr_reclaimed; + } + page = lru_to_page(swap_pages); -A + - page = lru_to_page(swap_pages); + list_del(&page->lru); -A + - list_del(&page->lru); + /* + * Anonymous process memory has backing store? @@ -56,7 +56,7 @@ A + ret_pages, free_pages); + continue; + } -A + - /* - * Anonymous process memory has backing store? - * Try to allocate it some swap space here. @@ -69,16 +69,16 @@ A + pg_dispose = handle_pgout(page_list, zone, sc, + ttu_flags, PAGEREF_RECLAIM, + true, true, &swap_ret, page); -A + - if (!add_to_swap(page, page_list, NULL)) { - pg_finish(page, PG_ACTIVATE_LOCKED, swap_ret, &nr_reclaimed, + pg_finish(page, pg_dispose, swap_ret, &nr_reclaimed, -A pgactivate, ret_pages, free_pages); + pgactivate, ret_pages, free_pages); - continue; -A } + } + } + return nr_reclaimed; -A + - if (clean) - pg_dispose = handle_pgout(page_list, zone, sc, ttu_flags, - PAGEREF_RECLAIM_CLEAN, true, true, &swap_ret, page); @@ -91,14 +91,8 @@ A + while (!list_empty(swap_pages)) { + page = lru_to_page(swap_pages); + pg_finish(page, PG_ACTIVATE_LOCKED, 0, &nr_reclaimed, -A pgactivate, ret_pages, free_pages); -A } -A return nr_reclaimed; ---A + pgactivate, ret_pages, free_pages); + } + return nr_reclaimed; +-- 2.5.5 - --- -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 a78d8c1..eff373d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -24,28 +24,28 @@ "\n" "Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>\n" "---\n" - "A mm/vmscan.c | 63 ++++++++++++++++++++++++++++++++++++++++---------------------\n" - "A 1 file changed, 42 insertions(+), 21 deletions(-)\n" + "\302\240mm/vmscan.c | 63 ++++++++++++++++++++++++++++++++++++++++---------------------\n" + "\302\2401 file changed, 42 insertions(+), 21 deletions(-)\n" "\n" "diff --git a/mm/vmscan.c b/mm/vmscan.c\n" "index e36d8a7..310e2b2 100644\n" "--- a/mm/vmscan.c\n" "+++ b/mm/vmscan.c\n" "@@ -1096,38 +1096,59 @@ static unsigned long shrink_anon_page_list(struct list_head *page_list,\n" - "A {\n" - "A \tunsigned long nr_reclaimed = 0;\n" - "A \tenum pg_result pg_dispose;\n" + "\302\240{\n" + "\302\240\tunsigned long nr_reclaimed = 0;\n" + "\302\240\tenum pg_result pg_dispose;\n" "+\tswp_entry_t swp_entries[SWAP_BATCH];\n" "+\tstruct page *page;\n" "+\tint m, i, k;\n" - "A \n" - "A \twhile (n > 0) {\n" + "\302\240\n" + "\302\240\twhile (n > 0) {\n" "-\t\tstruct page *page;\n" - "A \t\tint swap_ret = SWAP_SUCCESS;\n" - "A \n" + "\302\240\t\tint swap_ret = SWAP_SUCCESS;\n" + "\302\240\n" "-\t\t--n;\n" "-\t\tif (list_empty(swap_pages))\n" - "-\t\tA A A A A A A return nr_reclaimed;\n" + "-\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240return nr_reclaimed;\n" "+\t\tm = get_swap_pages(n, swp_entries);\n" "+\t\tif (!m)\n" "+\t\t\tgoto no_swap_slots;\n" @@ -58,10 +58,10 @@ "+\t\t\t\treturn nr_reclaimed;\n" "+\t\t\t}\n" "+\t\t\tpage = lru_to_page(swap_pages);\n" - "A \n" + "\302\240\n" "-\t\tpage = lru_to_page(swap_pages);\n" "+\t\t\tlist_del(&page->lru);\n" - "A \n" + "\302\240\n" "-\t\tlist_del(&page->lru);\n" "+\t\t\t/*\n" "+\t\t\t* Anonymous process memory has backing store?\n" @@ -74,7 +74,7 @@ "+\t\t\t\t\t\tret_pages, free_pages);\n" "+\t\t\t\tcontinue;\n" "+\t\t\t}\n" - "A \n" + "\302\240\n" "-\t\t/*\n" "-\t\t* Anonymous process memory has backing store?\n" "-\t\t* Try to allocate it some swap space here.\n" @@ -87,16 +87,16 @@ "+\t\t\t\tpg_dispose = handle_pgout(page_list, zone, sc,\n" "+\t\t\t\t\t\tttu_flags, PAGEREF_RECLAIM,\n" "+\t\t\t\t\t\ttrue, true, &swap_ret, page);\n" - "A \n" + "\302\240\n" "-\t\tif (!add_to_swap(page, page_list, NULL)) {\n" "-\t\t\tpg_finish(page, PG_ACTIVATE_LOCKED, swap_ret, &nr_reclaimed,\n" "+\t\t\tpg_finish(page, pg_dispose, swap_ret, &nr_reclaimed,\n" - "A \t\t\t\t\tpgactivate, ret_pages, free_pages);\n" + "\302\240\t\t\t\t\tpgactivate, ret_pages, free_pages);\n" "-\t\t\tcontinue;\n" - "A \t\t}\n" + "\302\240\t\t}\n" "+\t}\n" "+\treturn nr_reclaimed;\n" - "A \n" + "\302\240\n" "-\t\tif (clean)\n" "-\t\t\tpg_dispose = handle_pgout(page_list, zone, sc, ttu_flags,\n" "-\t\t\t\tPAGEREF_RECLAIM_CLEAN, true, true, &swap_ret, page);\n" @@ -109,16 +109,10 @@ "+\twhile (!list_empty(swap_pages)) {\n" "+\t\tpage = lru_to_page(swap_pages);\n" "+\t\tpg_finish(page, PG_ACTIVATE_LOCKED, 0, &nr_reclaimed,\n" - "A \t\t\t\tpgactivate, ret_pages, free_pages);\n" - "A \t}\n" - "A \treturn nr_reclaimed;\n" - "--A \n" - "2.5.5\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>" + "\302\240\t\t\t\tpgactivate, ret_pages, free_pages);\n" + "\302\240\t}\n" + "\302\240\treturn nr_reclaimed;\n" + "--\302\240\n" + 2.5.5 -20152e3def4e082cbe33dc9b445236315ed0771768511de0b4441ae3b79565c6 +053e6753aa02f46817c852b377f3daa4e5db6d088c272cca619b5c8bb46d7168
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.