diff for duplicates of <20090518035319.GA7940@localhost> diff --git a/a/1.txt b/N1/1.txt index 4bbe298..04a995a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,23 +2,23 @@ On Mon, May 18, 2009 at 11:35:31AM +0800, KOSAKI Motohiro wrote: > >> --- a/mm/vmscan.c > >> +++ b/mm/vmscan.c > >> @@ -2397,6 +2397,7 @@ static int __zone_reclaim(struct zone *z -> >> .isolate_pages = isolate_pages_global, -> >> }; -> >> unsigned long slab_reclaimable; -> >> + long nr_unmapped_file_pages; +> >> A A A A A A A .isolate_pages = isolate_pages_global, +> >> A A A }; +> >> A A A unsigned long slab_reclaimable; +> >> + A A long nr_unmapped_file_pages; > >> -> >> disable_swap_token(); -> >> cond_resched(); +> >> A A A disable_swap_token(); +> >> A A A cond_resched(); > >> @@ -2409,9 +2410,11 @@ static int __zone_reclaim(struct zone *z -> >> reclaim_state.reclaimed_slab = 0; -> >> p->reclaim_state = &reclaim_state; +> >> A A A reclaim_state.reclaimed_slab = 0; +> >> A A A p->reclaim_state = &reclaim_state; > >> -> >> - if (zone_page_state(zone, NR_FILE_PAGES) - -> >> - zone_page_state(zone, NR_FILE_MAPPED) > -> >> - zone->min_unmapped_pages) { -> >> + nr_unmapped_file_pages = zone_page_state(zone, NR_INACTIVE_FILE) + -> >> + zone_page_state(zone, NR_ACTIVE_FILE) - -> >> + zone_page_state(zone, NR_FILE_MAPPED); +> >> - A A if (zone_page_state(zone, NR_FILE_PAGES) - +> >> - A A A A A A zone_page_state(zone, NR_FILE_MAPPED) > +> >> - A A A A A A zone->min_unmapped_pages) { +> >> + A A nr_unmapped_file_pages = zone_page_state(zone, NR_INACTIVE_FILE) + +> >> + A A A A A A A A A A A A A A A zone_page_state(zone, NR_ACTIVE_FILE) - +> >> + A A A A A A A A A A A A A A A zone_page_state(zone, NR_FILE_MAPPED); > > > > This can possibly go negative. > @@ -38,7 +38,13 @@ Thanks, Fengguang > > -> >> + if (nr_unmapped_file_pages > zone->min_unmapped_pages) { -> >> /* -> >> * Free memory by calling shrink zone with increasing -> >> * priorities until we have enough memory freed. +> >> + A A if (nr_unmapped_file_pages > zone->min_unmapped_pages) { +> >> A A A A A A A /* +> >> A A A A A A A A * Free memory by calling shrink zone with increasing +> >> A A A A A A A A * priorities until we have enough memory freed. + +-- +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 e7ee434..e6efed9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -17,23 +17,23 @@ "> >> --- a/mm/vmscan.c\n" "> >> +++ b/mm/vmscan.c\n" "> >> @@ -2397,6 +2397,7 @@ static int __zone_reclaim(struct zone *z\n" - "> >> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 .isolate_pages = isolate_pages_global,\n" - "> >> \302\240 \302\240 \302\240 };\n" - "> >> \302\240 \302\240 \302\240 unsigned long slab_reclaimable;\n" - "> >> + \302\240 \302\240 long nr_unmapped_file_pages;\n" + "> >> A A A A A A A .isolate_pages = isolate_pages_global,\n" + "> >> A A A };\n" + "> >> A A A unsigned long slab_reclaimable;\n" + "> >> + A A long nr_unmapped_file_pages;\n" "> >>\n" - "> >> \302\240 \302\240 \302\240 disable_swap_token();\n" - "> >> \302\240 \302\240 \302\240 cond_resched();\n" + "> >> A A A disable_swap_token();\n" + "> >> A A A cond_resched();\n" "> >> @@ -2409,9 +2410,11 @@ static int __zone_reclaim(struct zone *z\n" - "> >> \302\240 \302\240 \302\240 reclaim_state.reclaimed_slab = 0;\n" - "> >> \302\240 \302\240 \302\240 p->reclaim_state = &reclaim_state;\n" + "> >> A A A reclaim_state.reclaimed_slab = 0;\n" + "> >> A A A p->reclaim_state = &reclaim_state;\n" "> >>\n" - "> >> - \302\240 \302\240 if (zone_page_state(zone, NR_FILE_PAGES) -\n" - "> >> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 zone_page_state(zone, NR_FILE_MAPPED) >\n" - "> >> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 zone->min_unmapped_pages) {\n" - "> >> + \302\240 \302\240 nr_unmapped_file_pages = zone_page_state(zone, NR_INACTIVE_FILE) +\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240zone_page_state(zone, NR_ACTIVE_FILE) -\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240zone_page_state(zone, NR_FILE_MAPPED);\n" + "> >> - A A if (zone_page_state(zone, NR_FILE_PAGES) -\n" + "> >> - A A A A A A zone_page_state(zone, NR_FILE_MAPPED) >\n" + "> >> - A A A A A A zone->min_unmapped_pages) {\n" + "> >> + A A nr_unmapped_file_pages = zone_page_state(zone, NR_INACTIVE_FILE) +\n" + "> >> + A A A A A A A A A A A A A A A zone_page_state(zone, NR_ACTIVE_FILE) -\n" + "> >> + A A A A A A A A A A A A A A A zone_page_state(zone, NR_FILE_MAPPED);\n" "> >\n" "> > This can possibly go negative.\n" "> \n" @@ -53,9 +53,15 @@ "Fengguang\n" "\n" "> >\n" - "> >> + \302\240 \302\240 if (nr_unmapped_file_pages > zone->min_unmapped_pages) {\n" - "> >> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 /*\n" - "> >> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240* Free memory by calling shrink zone with increasing\n" - "> >> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240* priorities until we have enough memory freed." + "> >> + A A if (nr_unmapped_file_pages > zone->min_unmapped_pages) {\n" + "> >> A A A A A A A /*\n" + "> >> A A A A A A A A * Free memory by calling shrink zone with increasing\n" + "> >> A A A A A A A A * priorities until we have enough memory freed.\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>" -8a607e2d9132671ffc70eba79d59b4fa1ec11d514d362f20f3ee1b8c3cd14790 +f2c8859c9711c4f7bb043f4b98eabc86d760b7e922fbf64dc7479bab28479e2c
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.