[lc-checkins] CVS: linux/mm filemap.c,1.26,1.27

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

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

Modified Files:
	filemap.c 
Log Message:
- Back out fixes for FS corruption under UML

- Swap buffer management was partially rewritten to fix another potential
bug which could hang the machine. Besides, get_comp_cache_page() now first
tries to free pages that have already been written by the swap buffers. Only
if it really can't make it, it writes out more fragments.



Index: filemap.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/filemap.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** filemap.c	28 May 2002 19:16:14 -0000	1.26
--- filemap.c	31 May 2002 16:48:53 -0000	1.27
***************
*** 757,763 ****
  		int error = 0;
  #ifdef CONFIG_COMP_PAGE_CACHE
! 		if (!read_comp_cache(mapping, offset, page))
! 			SetPageUptodate(page);
! 		else
  #endif
  			error = mapping->a_ops->readpage(file, page);
--- 757,761 ----
  		int error = 0;
  #ifdef CONFIG_COMP_PAGE_CACHE
! 		if (read_comp_cache(mapping, offset, page))
  #endif
  			error = mapping->a_ops->readpage(file, page);
***************
*** 1614,1621 ****
  
  #ifdef CONFIG_COMP_PAGE_CACHE
! 		if (!read_comp_cache(mapping, index, page)) {
! 			SetPageUptodate(page);
  			goto page_ok;
- 		}
  #endif
  		goto readpage;
--- 1612,1617 ----
  
  #ifdef CONFIG_COMP_PAGE_CACHE
! 		if (!read_comp_cache(mapping, index, page))
  			goto page_ok;
  #endif
  		goto readpage;
***************
*** 2918,2924 ****
  
  #ifdef CONFIG_COMP_PAGE_CACHE
! 		if (!read_comp_cache(mapping, index, page))
! 			SetPageUptodate(page);
! 		else
  #endif
  			err = filler(data, page);
--- 2914,2918 ----
  
  #ifdef CONFIG_COMP_PAGE_CACHE
! 		if (read_comp_cache(mapping, index, page))
  #endif
  			err = filler(data, page);