[lc-checkins] CVS: linux/mm/comp_cache swapin.c,1.33,1.34

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

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

Modified Files:
	swapin.c 
Log Message:

- Fixed compilation error in buffer.c when compiling it without compressed
cache.

- Fixed oops caused when running fillmem due to a null pointer

- Fixed major/minor faults for compressed cache. Now we have correct data
about when we actually had to perform IO to service a page fault.

- Improved support for clean pages. Now the clean page is compressed and
right away freed in shrink_cache().

- When a pte in do_no_page() has write access to the page, it's already set
as dirty. So, in the same way done in do_swap_page(), we already remove the
its fragment from compressed cache since it will need to be compressed again
anyway.



Index: swapin.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/comp_cache/swapin.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** swapin.c	28 Apr 2002 20:51:35 -0000	1.33
--- swapin.c	2 May 2002 16:31:37 -0000	1.34
***************
*** 2,6 ****
   * linux/mm/comp_cache/swapin.c
   *
!  * Time-stamp: <2002-04-28 17:19:57 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache/swapin.c
   *
!  * Time-stamp: <2002-04-30 11:36:19 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 41,46 ****
  	if (likely(!PageTestandClearCompCache(page)))
  		goto out;
! 	
! 	err = find_comp_page(page->mapping, page->index, &fragment); 
  	
  	if (err)
--- 41,49 ----
  	if (likely(!PageTestandClearCompCache(page)))
  		goto out;
! 
! 	/* we may have a null page->mapping if the page have been
! 	 * removed from swap cache before flushing its compressed
! 	 * cache entry, what may happen in do_swap_page() */
! 	err = find_comp_page(page->mapping?:&swapper_space, page->index, &fragment); 
  	
  	if (err)