--- Net2/vm/vm_swap.c	2018/04/24 18:03:57	1.1
+++ Net2/vm/vm_swap.c	2018/04/24 18:09:34	1.1.1.4
@@ -32,6 +32,7 @@
  *
  *	@(#)vm_swap.c	7.18 (Berkeley) 5/6/91
  */
+static char rcsid[] = "$Header: /var/lib/cvsd/net2/Net2/vm/vm_swap.c,v 1.1.1.4 2018/04/24 18:09:34 root Exp $";
 
 #include "param.h"
 #include "systm.h"
@@ -42,8 +43,8 @@
 #include "dmap.h"		/* XXX */
 #include "vnode.h"
 #include "specdev.h"
-#include "map.h"
 #include "file.h"
+#include "rlist.h"
 
 /*
  * Indirect driver for multi-controller paging.
@@ -85,8 +86,9 @@ swapinit()
 	if (bdevvp(swdevt[0].sw_dev, &swdevt[0].sw_vp))
 		panic("swapvp");
 	if (error = swfree(&proc0, 0)) {
-		printf("swfree errno %d\n", error);	/* XXX */
-		panic("swapinit swfree 0");
+		printf("\nwarning: no swap space present (yet)\n");
+		/* printf("(swfree (..., 0) -> %d)\n", error);	/* XXX */
+		/*panic("swapinit swfree 0");*/
 	}
 
 	/*
@@ -205,7 +207,9 @@ swapon(p, uap, retval)
 				return (EBUSY);
 			}
 			sp->sw_vp = vp;
+			printf("adding swap: ");
 			if (error = swfree(p, sp - swdevt)) {
+				printf("failed! (unchanged)\n");
 				vrele(vp);
 				return (error);
 			}
@@ -234,33 +238,23 @@ swfree(p, index)
 	int error;
 
 	sp = &swdevt[index];
+	nblks = sp->sw_nblks;
+	if (nblks <= 0)
+		return(ENXIO);
 	vp = sp->sw_vp;
 	if (error = VOP_OPEN(vp, FREAD|FWRITE, p->p_ucred, p))
 		return (error);
 	sp->sw_freed = 1;
-	nblks = sp->sw_nblks;
+
+	/*printf("%d blocks from device %d/%d ",
+		sp->sw_nblks, major(sp->sw_dev), minor(sp->sw_dev));*/
 	for (dvbase = 0; dvbase < nblks; dvbase += dmmax) {
 		blk = nblks - dvbase;
 		if ((vsbase = index*dmmax + dvbase*nswdev) >= nswap)
 			panic("swfree");
 		if (blk > dmmax)
 			blk = dmmax;
-		if (vsbase == 0) {
-			/*
-			 * First of all chunks... initialize the swapmap
-			 * the second half of the hunk.
-			 */
-			rminit(swapmap, (long)(blk/2), (long)(blk/2),
-			    "swap", nswapmap);
-		} else if (dvbase == 0) {
-			/*
-			 * Don't use the first cluster of the device
-			 * in case it starts with a label or boot block.
-			 */
-			rmfree(swapmap, blk - ctod(CLSIZE),
-			    vsbase + ctod(CLSIZE));
-		} else
-			rmfree(swapmap, blk, vsbase);
+		rlist_free(&swapmap, vsbase, vsbase + blk - 1); 
 	}
 	return (0);
 }