lkml.org 
[lkml]   [2009]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] Rename pgmoved variable in shrink_active_list()
    Date
    Subject: [PATCH] Rename pgmoved variable in shrink_active_list()

    Currently, pgmoved variable have two meanings. it cause harder reviewing a bit.
    This patch separate it.


    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    ---
    mm/vmscan.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    Index: b/mm/vmscan.c
    ===================================================================
    --- a/mm/vmscan.c
    +++ b/mm/vmscan.c
    @@ -1239,7 +1239,7 @@ static void move_active_pages_to_lru(str
    static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
    struct scan_control *sc, int priority, int file)
    {
    - unsigned long pgmoved;
    + unsigned long nr_taken;
    unsigned long pgscanned;
    unsigned long vm_flags;
    LIST_HEAD(l_hold); /* The pages which were snipped off */
    @@ -1247,10 +1247,11 @@ static void shrink_active_list(unsigned
    LIST_HEAD(l_inactive);
    struct page *page;
    struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);
    + unsigned long nr_rotated = 0;

    lru_add_drain();
    spin_lock_irq(&zone->lru_lock);
    - pgmoved = sc->isolate_pages(nr_pages, &l_hold, &pgscanned, sc->order,
    + nr_taken = sc->isolate_pages(nr_pages, &l_hold, &pgscanned, sc->order,
    ISOLATE_ACTIVE, zone,
    sc->mem_cgroup, 1, file);
    /*
    @@ -1260,16 +1261,15 @@ static void shrink_active_list(unsigned
    if (scanning_global_lru(sc)) {
    zone->pages_scanned += pgscanned;
    }
    - reclaim_stat->recent_scanned[!!file] += pgmoved;
    + reclaim_stat->recent_scanned[!!file] += nr_taken;

    __count_zone_vm_events(PGREFILL, zone, pgscanned);
    if (file)
    - __mod_zone_page_state(zone, NR_ACTIVE_FILE, -pgmoved);
    + __mod_zone_page_state(zone, NR_ACTIVE_FILE, -nr_taken);
    else
    - __mod_zone_page_state(zone, NR_ACTIVE_ANON, -pgmoved);
    + __mod_zone_page_state(zone, NR_ACTIVE_ANON, -nr_taken);
    spin_unlock_irq(&zone->lru_lock);

    - pgmoved = 0; /* count referenced (mapping) mapped pages */
    while (!list_empty(&l_hold)) {
    cond_resched();
    page = lru_to_page(&l_hold);
    @@ -1283,7 +1283,7 @@ static void shrink_active_list(unsigned
    /* page_referenced clears PageReferenced */
    if (page_mapping_inuse(page) &&
    page_referenced(page, 0, sc->mem_cgroup, &vm_flags)) {
    - pgmoved++;
    + nr_rotated++;
    /*
    * Identify referenced, file-backed active pages and
    * give them one more trip around the active list. So
    @@ -1312,7 +1312,7 @@ static void shrink_active_list(unsigned
    * helps balance scan pressure between file and anonymous pages in
    * get_scan_ratio.
    */
    - reclaim_stat->recent_rotated[!!file] += pgmoved;
    + reclaim_stat->recent_rotated[!!file] += nr_rotated;

    move_active_pages_to_lru(zone, &l_active,
    LRU_ACTIVE + file * LRU_FILE);



    \
     
     \ /
      Last update: 2009-07-16 02:55    [W:0.026 / U:183.548 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site