[lc-checkins] CVS: linux/mm/comp_cache swapin.c,1.16,1.17

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

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

Modified Files:
	swapin.c 
Log Message:
- removed an if that may cause a wrong kernel BUG(). It's possible to not
find a vswap entry if the pte has been changed in the meanwhile (so that if
may be true and system still stable).



Index: swapin.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/comp_cache/swapin.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** swapin.c	2002/01/24 22:05:04	1.16
--- swapin.c	2002/01/26 16:50:45	1.17
***************
*** 2,6 ****
   * linux/mm/comp_cache/swapin.c
   *
!  * Time-stamp: <2002-01-24 11:39:11 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache/swapin.c
   *
!  * Time-stamp: <2002-01-26 14:30:29 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 96,104 ****
  	/* it will happen with vswap address only if the vswap address
  	 * had a real address assigned */
! 	if (!comp_page) {
! 		if (vswap_address(entry) && !vswap_address[SWP_OFFSET(entry)]->real_entry.val)
! 			BUG();
  		goto out;
- 	}
  
  	/* has the page already been allocated? if it's not, let's
--- 96,101 ----
  	/* it will happen with vswap address only if the vswap address
  	 * had a real address assigned */
! 	if (!comp_page)
  		goto out;
  
  	/* has the page already been allocated? if it's not, let's