[lc-checkins] CVS: linux/mm/comp_cache vswap.c,1.31,1.32

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

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

Modified Files:
	vswap.c 
Log Message:
Bug fixes
o Fixed potential bug that would panic if couldn't allocate vswap table.

Other
o Updated version from 0.23pre6 to 0.23pre7



Index: vswap.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/comp_cache/vswap.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** vswap.c	18 Jun 2002 12:47:21 -0000	1.31
--- vswap.c	18 Jun 2002 13:04:11 -0000	1.32
***************
*** 2,6 ****
   * linux/mm/comp_cache/vswap.c
   *
!  * Time-stamp: <2002-06-17 17:52:54 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache/vswap.c
   *
!  * Time-stamp: <2002-06-18 09:51:31 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 54,58 ****
  unsigned short last_page = 0;
  
! static void
  comp_cache_vswap_alloc(void)
  {
--- 54,58 ----
  unsigned short last_page = 0;
  
! static int
  comp_cache_vswap_alloc(void)
  {
***************
*** 64,68 ****
  	
  	if (!vswap_address)
! 		panic("comp_cache_vswap_init(): cannot allocate vswap_address");
  
  	vswap_current_num_entries = NUM_VSWAP_ENTRIES;
--- 64,68 ----
  	
  	if (!vswap_address)
! 		return 0;
  
  	vswap_current_num_entries = NUM_VSWAP_ENTRIES;
***************
*** 73,76 ****
--- 73,78 ----
  	for (i = 0; i < NUM_VSWAP_ENTRIES; i++)
  		vswap_alloc_and_init(vswap_address, i);
+ 	
+ 	return 1;
  }
  
***************
*** 159,164 ****
  	entry.val = 0;
  
! 	if (!vswap_address)
! 		comp_cache_vswap_alloc();
  
  	if (!comp_cache_available_vswap())
--- 161,166 ----
  	entry.val = 0;
  
! 	if (!vswap_address && !comp_cache_vswap_alloc())
! 		return entry;
  
  	if (!comp_cache_available_vswap())