Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1742f19f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] vmscan: rename functions 



We have:

	try_to_free_pages
	->shrink_caches(struct zone **zones, ..)
	  ->shrink_zone(struct zone *, ...)
	    ->shrink_cache(struct zone *, ...)
	      ->shrink_list(struct list_head *, ...)
	    ->refill_inactive_list((struct zone *, ...)

which is fairly irrational.

Rename things so that we have

 	try_to_free_pages
 	->shrink_zones(struct zone **zones, ..)
 	  ->shrink_zone(struct zone *, ...)
 	    ->shrink_inactive_list(struct zone *, ...)
 	      ->shrink_page_list(struct list_head *, ...)
	    ->shrink_active_list(struct zone *, ...)

Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Lameter <christoph@lameter.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 05ff5137

mm/vmscan.c

+17 −15
Original line number Original line Diff line number Diff line
@@ -298,7 +298,8 @@ static void handle_write_error(struct address_space *mapping, 
}

}





/*

/*

 * pageout is called by shrink_list() for each dirty page. Calls ->writepage().

 * pageout is called by shrink_page_list() for each dirty page.

 * Calls ->writepage().

 */

 */

static pageout_t pageout(struct page *page, struct address_space *mapping)

static pageout_t pageout(struct page *page, struct address_space *mapping)

{

{
@@ -406,9 +407,9 @@ static int remove_mapping(struct address_space *mapping, struct page *page) 
}

}





/*

/*

 * shrink_list return the number of reclaimed pages

 * shrink_page_list() returns the number of reclaimed pages

 */

 */

static unsigned long shrink_list(struct list_head *page_list,

static unsigned long shrink_page_list(struct list_head *page_list,

					struct scan_control *sc)

					struct scan_control *sc)

{

{

	LIST_HEAD(ret_pages);

	LIST_HEAD(ret_pages);
@@ -1103,10 +1104,11 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, 
}

}





/*

/*

 * shrink_cache() return the number of reclaimed pages

 * shrink_inactive_list() is a helper for shrink_zone().  It returns the number

 * of reclaimed pages

 */

 */

static unsigned long shrink_cache(unsigned long max_scan, struct zone *zone,

static unsigned long shrink_inactive_list(unsigned long max_scan,

				struct scan_control *sc)

				struct zone *zone, struct scan_control *sc)

{

{

	LIST_HEAD(page_list);

	LIST_HEAD(page_list);

	struct pagevec pvec;

	struct pagevec pvec;
@@ -1134,7 +1136,7 @@ static unsigned long shrink_cache(unsigned long max_scan, struct zone *zone, 
			goto done;

			goto done;





		nr_scanned += nr_scan;

		nr_scanned += nr_scan;

		nr_freed = shrink_list(&page_list, sc);

		nr_freed = shrink_page_list(&page_list, sc);

		nr_reclaimed += nr_freed;

		nr_reclaimed += nr_freed;

		local_irq_disable();

		local_irq_disable();

		if (current_is_kswapd()) {

		if (current_is_kswapd()) {
@@ -1187,8 +1189,7 @@ static unsigned long shrink_cache(unsigned long max_scan, struct zone *zone, 
 * The downside is that we have to touch page->_count against each page.

 * The downside is that we have to touch page->_count against each page.

 * But we had to alter page->flags anyway.

 * But we had to alter page->flags anyway.

 */

 */

static void

static void shrink_active_list(unsigned long nr_pages, struct zone *zone,

refill_inactive_zone(unsigned long nr_pages, struct zone *zone,

				struct scan_control *sc)

				struct scan_control *sc)

{

{

	unsigned long pgmoved;

	unsigned long pgmoved;
@@ -1360,14 +1361,15 @@ static unsigned long shrink_zone(int priority, struct zone *zone, 
			nr_to_scan = min(nr_active,

			nr_to_scan = min(nr_active,

					(unsigned long)sc->swap_cluster_max);

					(unsigned long)sc->swap_cluster_max);

			nr_active -= nr_to_scan;

			nr_active -= nr_to_scan;

			refill_inactive_zone(nr_to_scan, zone, sc);

			shrink_active_list(nr_to_scan, zone, sc);

		}

		}





		if (nr_inactive) {

		if (nr_inactive) {

			nr_to_scan = min(nr_inactive,

			nr_to_scan = min(nr_inactive,

					(unsigned long)sc->swap_cluster_max);

					(unsigned long)sc->swap_cluster_max);

			nr_inactive -= nr_to_scan;

			nr_inactive -= nr_to_scan;

			nr_reclaimed += shrink_cache(nr_to_scan, zone, sc);

			nr_reclaimed += shrink_inactive_list(nr_to_scan, zone,

								sc);

		}

		}

	}

	}
@@ -1393,7 +1395,7 @@ static unsigned long shrink_zone(int priority, struct zone *zone, 
 * If a zone is deemed to be full of pinned pages then just give it a light

 * If a zone is deemed to be full of pinned pages then just give it a light

 * scan then give up on it.

 * scan then give up on it.

 */

 */

static unsigned long shrink_caches(int priority, struct zone **zones,

static unsigned long shrink_zones(int priority, struct zone **zones,

					struct scan_control *sc)

					struct scan_control *sc)

{

{

	unsigned long nr_reclaimed = 0;

	unsigned long nr_reclaimed = 0;
@@ -1466,7 +1468,7 @@ unsigned long try_to_free_pages(struct zone **zones, gfp_t gfp_mask) 
		sc.nr_scanned = 0;

		sc.nr_scanned = 0;

		if (!priority)

		if (!priority)

			disable_swap_token();

			disable_swap_token();

		nr_reclaimed += shrink_caches(priority, zones, &sc);

		nr_reclaimed += shrink_zones(priority, zones, &sc);

		shrink_slab(sc.nr_scanned, gfp_mask, lru_pages);

		shrink_slab(sc.nr_scanned, gfp_mask, lru_pages);

		if (reclaim_state) {

		if (reclaim_state) {

			nr_reclaimed += reclaim_state->reclaimed_slab;

			nr_reclaimed += reclaim_state->reclaimed_slab;