Page MenuHomeFreeBSD
Files F155072984

D23274.id.diff
No OneTemporary
Actions

D23274.id.diff
View Options

Index: sys/vm/swap_pager.c
===================================================================
--- sys/vm/swap_pager.c
+++ sys/vm/swap_pager.c
@@ -417,13 +417,22 @@
static void swp_sizecheck(void);
static void swp_pager_async_iodone(struct buf *bp);
-static bool swp_pager_swblk_empty(struct swblk *sb, int start, int limit);
static void swp_pager_free_empty_swblk(vm_object_t, struct swblk *sb);
static int swapongeom(struct vnode *);
static int swaponvp(struct thread *, struct vnode *, u_long);
static int swapoff_one(struct swdevt *sp, struct ucred *cred);
/*
+ * Swap swdevt functions
+ */
+static bool swp_swdevt_isondev(struct swdevt *sp, daddr_t blk);
+
+/*
+ * Swap swblk functions
+ */
+static bool swp_swblk_empty(struct swblk *sb, int start, int limit);
+
+/*
* Swap bitmap functions
*/
static void swp_pager_freeswapspace(daddr_t blk, daddr_t npages);
@@ -801,7 +810,7 @@
}
static bool
-swp_pager_isondev(daddr_t blk, struct swdevt *sp)
+swp_swdevt_isondev(struct swdevt *sp, daddr_t blk)
{
return (blk >= sp->sw_first && blk < sp->sw_end);
@@ -814,7 +823,7 @@
mtx_lock(&sw_dev_mtx);
TAILQ_FOREACH(sp, &swtailq, sw_list) {
- if (swp_pager_isondev(bp->b_blkno, sp)) {
+ if (swp_swdevt_isondev(sp, bp->b_blkno)) {
mtx_unlock(&sw_dev_mtx);
if ((sp->sw_flags & SW_UNMAPPED) != 0 &&
unmapped_buf_allowed) {
@@ -848,7 +857,7 @@
return;
mtx_lock(&sw_dev_mtx);
TAILQ_FOREACH(sp, &swtailq, sw_list) {
- if (swp_pager_isondev(blk, sp)) {
+ if (swp_swdevt_isondev(sp, blk)) {
sp->sw_used -= npages;
/*
* If we are attempting to stop swapping on
@@ -1798,7 +1807,7 @@
&object->un_pager.swp.swp_blks, pi)) != NULL; ) {
for (i = 0; i < SWAP_META_PAGES; i++) {
blk = sb->d[i];
- if (!swp_pager_isondev(blk, sp))
+ if (!swp_swdevt_isondev(sp, blk))
blk = SWAPBLK_NONE;
/*
@@ -1927,10 +1936,10 @@
*/
/*
- * SWP_PAGER_SWBLK_EMPTY() - is a range of blocks free?
+ * SWP_SWBLK_EMPTY() - is a range of blocks free?
*/
static bool
-swp_pager_swblk_empty(struct swblk *sb, int start, int limit)
+swp_swblk_empty(struct swblk *sb, int start, int limit)
{
int i;
@@ -1951,7 +1960,7 @@
swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb)
{
- if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
+ if (swp_swblk_empty(sb, 0, SWAP_META_PAGES)) {
SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p);
uma_zfree(swblk_zone, sb);
}
@@ -2125,8 +2134,8 @@
sb->d[i] = SWAPBLK_NONE;
}
pindex = sb->p + SWAP_META_PAGES;
- if (swp_pager_swblk_empty(sb, 0, start) &&
- swp_pager_swblk_empty(sb, limit, SWAP_META_PAGES)) {
+ if (swp_swblk_empty(sb, 0, start) &&
+ swp_swblk_empty(sb, limit, SWAP_META_PAGES)) {
SWAP_PCTRIE_REMOVE(&srcobject->un_pager.swp.swp_blks,
sb->p);
uma_zfree(swblk_zone, sb);

File Metadata

Mime Type
text/plain
Expires
Sat, May 2, 5:09 AM (19 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32607956
Default Alt Text
D23274.id.diff (2 KB)

Event Timeline