[lc-checkins] CVS: linux/mm filemap.c,1.15,1.16 memory.c,1.23,1.24 swapfile.c,1.27,1.28

[Rodrigo S. de C. <rc...@us...>]

Update of /cvsroot/linuxcompressed/linux/mm
In directory usw-pr-cvs1:/tmp/cvs-serv23908/mm

Modified Files:
	filemap.c memory.c swapfile.c 
Log Message:
- Clean pages support in compressed cache is improved even more.

- Clean and dirty pages are only removed from the compressed cache
when writeout_fragments() is called or the program exits.

- removed an obsolete code for CONFIG_COMP_SWAP

- improved writeout_fragments(), which will try to free fragments even
if we can't perform IO. In this case, we will free only clean
fragments.



Index: filemap.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/filemap.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** filemap.c	26 Feb 2002 20:59:01 -0000	1.15
--- filemap.c	27 Feb 2002 14:16:52 -0000	1.16
***************
*** 755,759 ****
  	spin_unlock(&pagecache_lock);
  	if (page) {
! 		invalidate_comp_page(mapping, offset, page);
  		return 0;
  	}
--- 755,759 ----
  	spin_unlock(&pagecache_lock);
  	if (page) {
! 		clear_comp_page(mapping, offset, page);
  		return 0;
  	}
***************
*** 916,920 ****
  	if (page) {
  		page_cache_get(page);
! 		invalidate_comp_page(mapping, offset, page);
  	}
  	spin_unlock(&pagecache_lock);
--- 916,920 ----
  	if (page) {
  		page_cache_get(page);
! 		clear_comp_page(mapping, offset, page);
  	}
  	spin_unlock(&pagecache_lock);
***************
*** 971,975 ****
  			}
  		}
! 		invalidate_comp_page(mapping, offset, page);
  	}
  	else {
--- 971,975 ----
  			}
  		}
! 		clear_comp_page(mapping, offset, page);
  	}
  	else {
***************
*** 1459,1463 ****
  found_page:
  		page_cache_get(page);
! 		invalidate_comp_page(mapping, index, page);
  		spin_unlock(&pagecache_lock);
  
--- 1459,1463 ----
  found_page:
  		page_cache_get(page);
! 		clear_comp_page(mapping, index, page);
  		spin_unlock(&pagecache_lock);
  

Index: memory.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/memory.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** memory.c	26 Feb 2002 20:59:01 -0000	1.23
--- memory.c	27 Feb 2002 14:16:52 -0000	1.24
***************
*** 1192,1196 ****
  
  	remove_pte_vswap(page_table);
! 	invalidate_comp_page(page->mapping, page->index, page);
  	
  	/* The page isn't present yet, go ahead with the fault. */
--- 1192,1196 ----
  
  	remove_pte_vswap(page_table);
! 	clear_comp_page(page->mapping, page->index, page);
  	
  	/* The page isn't present yet, go ahead with the fault. */

Index: swapfile.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/swapfile.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** swapfile.c	26 Feb 2002 20:59:01 -0000	1.27
--- swapfile.c	27 Feb 2002 14:16:52 -0000	1.28
***************
*** 215,219 ****
  		if (!count) {
  			entry = SWP_ENTRY(p - swap_info, offset);
! 			invalidate_comp_page(&swapper_space, entry.val, NULL);
  			if (offset < p->lowest_bit)
  				p->lowest_bit = offset;
--- 215,219 ----
  		if (!count) {
  			entry = SWP_ENTRY(p - swap_info, offset);
! 			invalidate_comp_cache(&swapper_space, entry.val);
  			if (offset < p->lowest_bit)
  				p->lowest_bit = offset;