[lc-checkins] CVS: linux26/mm swapfile.c, 1.5, 1.6 vmscan.c, 1.13, 1.14

[Nitin G. <nit...@us...>]

Update of /cvsroot/linuxcompressed/linux26/mm
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5254/mm

Modified Files:
	swapfile.c vmscan.c 
Log Message:
kernel 2.6.17.1: vswap stable. Started work on add_to_ccache() and friends

Index: swapfile.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux26/mm/swapfile.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** swapfile.c	15 Jun 2006 10:24:07 -0000	1.5
--- swapfile.c	21 Jun 2006 17:12:47 -0000	1.6
***************
*** 91,95 ****
  	int latency_ration = LATENCY_LIMIT;
  
- 	pr_info("** start scan_swap_map **\n");
  	/* 
  	 * We try to cluster swap pages by allocating them sequentially
--- 91,94 ----
***************
*** 152,156 ****
  		si->cluster_next = offset + 1;
  		si->flags -= SWP_SCANNING;
! 		pr_info("** scan_map: return in mid **\n");
  		return offset;
  	}
--- 151,157 ----
  		si->cluster_next = offset + 1;
  		si->flags -= SWP_SCANNING;
! 		if (si->flags & SWP_COMPRESSED) {
! 			pr_info("scan_swap_map: vswap offset: %lu\n", offset);
! 		}
  		return offset;
  	}
***************
*** 172,176 ****
  no_page:
  	si->flags -= SWP_SCANNING;
- 	pr_info("** end scan_swap_map **\n");
  	return 0;
  }
--- 173,176 ----
***************
*** 196,202 ****
  			wrapped++;
  		}
! 		
! 		pr_info("get_swap_page loop\n");
! 		
  		if (!si->highest_bit)
  			continue;
--- 196,200 ----
  			wrapped++;
  		}
! 
  		if (!si->highest_bit)
  			continue;
***************
*** 636,640 ****
  static unsigned int find_next_to_unuse(struct swap_info_struct *si,
  					unsigned int prev)
! {	
  	unsigned int max = si->max;
  	unsigned int i = prev;
--- 634,638 ----
  static unsigned int find_next_to_unuse(struct swap_info_struct *si,
  					unsigned int prev)
! {
  	unsigned int max = si->max;
  	unsigned int i = prev;
***************
*** 1166,1171 ****
  	int i, type, prev;
  	int err;
- 
- 	printk(KERN_INFO "sys_swapoff called.\n");
  	
  	if (!capable(CAP_SYS_ADMIN))
--- 1164,1167 ----
***************
*** 1338,1342 ****
  
  	if (ptr->flags & SWP_COMPRESSED) {
! 		pr_info("virt swap to be printed\n");
  		return 0;
  	}
--- 1334,1338 ----
  
  	if (ptr->flags & SWP_COMPRESSED) {
! 		pr_info("vswap to be printed\n");
  		return 0;
  	}
***************
*** 1390,1394 ****
  	unsigned int type=swp_type(entry);
  	if (swap_info[type].flags & SWP_COMPRESSED) {
! 		pr_info("This is virt swap\n");
  		return 1;
  	}
--- 1386,1390 ----
  	unsigned int type=swp_type(entry);
  	if (swap_info[type].flags & SWP_COMPRESSED) {
! 		// pr_info("This is virt swap\n");
  		return 1;
  	}
***************
*** 1488,1491 ****
--- 1484,1488 ----
  EXPORT_SYMBOL(set_anon_cc_size);
  
+ 
  /*
   * Written 01/25/92 by Simmule Turner, heavily changed by Linus.
***************
*** 1678,1685 ****
  		 */
  		maxpages = swp_offset(pte_to_swp_entry(swp_entry_to_pte(swp_entry(0,~0UL)))) - 1;
! 		if (maxpages > swap_header->info.last_page) {
  			maxpages = swap_header->info.last_page;
- 			pr_info("in sys_swapon swap_header->info.last_page: %lu\n", maxpages);
- 		}
  		p->highest_bit = maxpages - 1;
  
--- 1675,1680 ----
  		 */
  		maxpages = swp_offset(pte_to_swp_entry(swp_entry_to_pte(swp_entry(0,~0UL)))) - 1;
! 		if (maxpages > swap_header->info.last_page)
  			maxpages = swap_header->info.last_page;
  		p->highest_bit = maxpages - 1;
  
***************
*** 1740,1744 ****
  	spin_lock(&swap_lock);
  	p->flags = SWP_ACTIVE;
- 	pr_info("in sys_swapon: nr_good_pages: %u\n", nr_good_pages);
  	nr_swap_pages += nr_good_pages;
  	total_swap_pages += nr_good_pages;
--- 1735,1738 ----
***************
*** 1835,1843 ****
  	offset = swp_offset(entry);
  
- 	pr_info("swp_dup: offset: %lu\n", offset);
- 	pr_info("swp_dup: p->max: %u\n", p->max);
- 	if (offset < p->max) pr_info("swp_dup: p->swap_map[offset]: %d\n", p->swap_map[offset]);
- 
- 
  	spin_lock(&swap_lock);
  	if (offset < p->max && p->swap_map[offset]) {
--- 1829,1832 ----

Index: vmscan.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux26/mm/vmscan.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** vmscan.c	11 Jun 2006 20:03:48 -0000	1.13
--- vmscan.c	21 Jun 2006 17:12:47 -0000	1.14
***************
*** 314,324 ****
  	 * See swapfile.c:page_queue_congested().
  	 */
- 	
  	if (PageWillCompress(page)) {
! 		pr_info("Compressed page in pageout\n");
  		ClearPageWillCompress(page);
  		return PAGE_KEEP;
  	}
! 
  	if (!is_page_cache_freeable(page))
  		return PAGE_KEEP;
--- 314,323 ----
  	 * See swapfile.c:page_queue_congested().
  	 */
  	if (PageWillCompress(page)) {
! 		pr_info("pageout: page to compress\n");
  		ClearPageWillCompress(page);
  		return PAGE_KEEP;
  	}
! 		
  	if (!is_page_cache_freeable(page))
  		return PAGE_KEEP;
***************
*** 1074,1078 ****
  	total_scanned = 0;
  	nr_reclaimed = 0;
! 	sc.may_writepage = !laptop_mode,
  	sc.nr_mapped = read_page_state(nr_mapped);
  
--- 1073,1077 ----
  	total_scanned = 0;
  	nr_reclaimed = 0;
! 	sc.may_writepage = !laptop_mode;
  	sc.nr_mapped = read_page_state(nr_mapped);