Page MenuHomeFreeBSD
Files F148456175

D22402.id.diff
No OneTemporary
Actions

D22402.id.diff
View Options

Index: head/sys/vm/swap_pager.c
===================================================================
--- head/sys/vm/swap_pager.c
+++ head/sys/vm/swap_pager.c
@@ -407,6 +407,7 @@
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);
@@ -1872,6 +1873,21 @@
}
return (true);
}
+
+/*
+ * SWP_PAGER_FREE_EMPTY_SWBLK() - frees if a block is free
+ *
+ * Nothing is done if the block is still in use.
+ */
+static void
+swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb)
+{
+
+ if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
+ SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p);
+ uma_zfree(swblk_zone, sb);
+ }
+}
/*
* SWP_PAGER_META_BUILD() - add swap block to swap meta data for object
@@ -1990,11 +2006,8 @@
/*
* Free the swblk if we end up with the empty page run.
*/
- if (swapblk == SWAPBLK_NONE &&
- swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
- SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, rdpi);
- uma_zfree(swblk_zone, sb);
- }
+ if (swapblk == SWAPBLK_NONE)
+ swp_pager_free_empty_swblk(object, sb);
return (prev_swapblk);
}
@@ -2140,11 +2153,7 @@
return (SWAPBLK_NONE);
if ((flags & SWM_POP) != 0) {
sb->d[pindex % SWAP_META_PAGES] = SWAPBLK_NONE;
- if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
- SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks,
- rounddown(pindex, SWAP_META_PAGES));
- uma_zfree(swblk_zone, sb);
- }
+ swp_pager_free_empty_swblk(object, sb);
}
return (r1);
}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 19, 12:31 AM (15 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29867757
Default Alt Text
D22402.id.diff (1 KB)

Event Timeline