d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Synchronize access to the swdevt's sw_blist with sw_dev_mtx.

Browse Source 
- Remove several instances of GIANT_REQUIRED.
This commit is contained in:
Alan Cox 2003-10-30 09:12:43 +00:00
parent 565e3e6567
commit 7645e88596
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=121727
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/vm/swap_pager.c
View File

@ -298,7 +298,6 @@ static daddr_t swp_pager_meta_ctl(vm_object_t, vm_pindex_t, int);
static void
swp_sizecheck(void)
{
GIANT_REQUIRED;
if (swap_pager_avail < nswap_lowat) {
if (swap_pager_almost_full == 0) {
@ -585,8 +584,6 @@ swp_pager_getswapspace(int npages)
struct swdevt *sp;
int i;
GIANT_REQUIRED;
blk = SWAPBLK_NONE;
mtx_lock(&sw_dev_mtx);
sp = swdevhd;
@ -668,23 +665,26 @@ swp_pager_freeswapspace(daddr_t blk, int npages)
{
struct swdevt *sp;
GIANT_REQUIRED;
sp = swp_pager_find_dev(blk);
/* per-swap area stats */
sp->sw_used -= npages;
/*
* If we are attempting to stop swapping on this device, we
* don't want to mark any blocks free lest they be reused.
*/
if (sp->sw_flags & SW_CLOSING)
return;
blist_free(sp->sw_blist, blk - sp->sw_first, npages);
swap_pager_avail += npages;
swp_sizecheck();
mtx_lock(&sw_dev_mtx);
TAILQ_FOREACH(sp, &swtailq, sw_list) {
if (blk >= sp->sw_first && blk < sp->sw_end) {
sp->sw_used -= npages;
/*
* If we are attempting to stop swapping on
* this device, we don't want to mark any
* blocks free lest they be reused.
*/
if ((sp->sw_flags & SW_CLOSING) == 0) {
blist_free(sp->sw_blist, blk - sp->sw_first,
npages);
swap_pager_avail += npages;
swp_sizecheck();
}
mtx_unlock(&sw_dev_mtx);
return;
}
}
panic("Swapdev not found");
}
/*