Make sure b_vp and b_bufobj are NULL before calling relpbuf(), as it asserts

they are. They should be NULL at this point, except if we're coming from
swapdev_strategy().
It should only affect the case where we're swapping directly on a file over
NFS.

1 files changed, 9 insertions, 0 deletions

diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index a4ee9d6..1dfa279 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1512,6 +1512,15 @@ swp_pager_async_iodone(struct buf *bp)
 		VM_OBJECT_UNLOCK(object);
 	}
 
+	/* 
+	 * swapdev_strategy() manually sets b_vp and b_bufobj before calling 
+	 * bstrategy(). Set them back to NULL now we're done with it, or we'll
+	 * trigger a KASSERT in relpbuf().
+	 */
+	if (bp->b_vp) {
+		    bp->b_vp = NULL;
+		    bp->b_bufobj = NULL;
+	}
 	/*
 	 * release the physical I/O buffer
 	 */