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

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

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

Modified Files:
	swapfile.c 
Log Message:
Feature
o Make resizing (manual, not on demand) work with a preempted
kernel. First and very crude implementation. So far, swap cache
support and manual resizing are working in the tests that have been
run.

Cleanups
o Cleanups in virtual_swap_free() (now __virtual_swap_free())
function.



Index: swapfile.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/swapfile.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** swapfile.c	17 Jul 2002 20:44:36 -0000	1.33
--- swapfile.c	18 Jul 2002 21:31:08 -0000	1.34
***************
*** 201,210 ****
  {
  	if (vswap_info_struct(p))
! 		goto virtual_swap;
  	swap_device_unlock(p);
  	swap_list_unlock();
- 	return;
- virtual_swap:
- 	spin_unlock(&virtual_swap_list);
  }
  
--- 201,207 ----
  {
  	if (vswap_info_struct(p))
! 		return;
  	swap_device_unlock(p);
  	swap_list_unlock();
  }
  
***************
*** 268,271 ****
--- 265,269 ----
  			if (vswap_address[SWP_OFFSET(entry)]->swap_count == 1)
  				exclusive = 1;
+ 			spin_unlock(&virtual_swap_list);
  			goto check_exclusive;
  		}
***************
*** 344,347 ****
--- 342,346 ----
  		if (vswap_address[SWP_OFFSET(entry)]->swap_count == 1)
  			exclusive = 1;
+ 		spin_unlock(&virtual_swap_list);
  		goto check_exclusive;
  	}