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

- Synchronize access to swdevhd using sw_dev_mtx.

Browse Source 
- Use swp_sizecheck() rather than assignment to swap_pager_full in
   swaponsomething().
This commit is contained in:
Alan Cox 2003-10-30 07:11:06 +00:00
parent 654c287479
commit d05bc12976
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=121725
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/vm/swap_pager.c
View File

@ -597,23 +597,23 @@ swp_pager_getswapspace(int npages)
blk = blist_alloc(sp->sw_blist, npages);
if (blk != SWAPBLK_NONE) {
blk += sp->sw_first;
swap_pager_avail -= npages;
sp->sw_used += npages;
swap_pager_avail -= npages;
swp_sizecheck();
swdevhd = TAILQ_NEXT(sp, sw_list);
mtx_unlock(&sw_dev_mtx);
return(blk);
goto done;
}
}
sp = TAILQ_NEXT(sp, sw_list);
}
mtx_unlock(&sw_dev_mtx);
if (swap_pager_full != 2) {
printf("swap_pager_getswapspace(%d): failed\n", npages);
swap_pager_full = 2;
swap_pager_almost_full = 1;
}
swdevhd = NULL;
done:
mtx_unlock(&sw_dev_mtx);
return (blk);
}
@ -2174,9 +2174,9 @@ swaponsomething(struct vnode *vp, void *id, u_long nblks, sw_strategy_t *strateg
sp->sw_end = dvbase + nblks;
TAILQ_INSERT_TAIL(&swtailq, sp, sw_list);
nswapdev++;
mtx_unlock(&sw_dev_mtx);
swap_pager_avail += nblks;
swap_pager_full = 0;
swp_sizecheck();
mtx_unlock(&sw_dev_mtx);
}
/*
@ -2278,9 +2278,9 @@ swapoff(struct thread *td, struct swapoff_args *uap)
mtx_lock(&sw_dev_mtx);
TAILQ_REMOVE(&swtailq, sp, sw_list);
nswapdev--;
mtx_unlock(&sw_dev_mtx);
if (swdevhd == sp)
swdevhd = NULL;
mtx_unlock(&sw_dev_mtx);
blist_destroy(sp->sw_blist);
free(sp, M_VMPGDATA);