Complete the bio/buf divorce for all code below devfs::strategy

Exceptions:
        Vinum untouched.  This means that it cannot be compiled.
        Greg Lehey is on the case.

        CCD not converted yet, casts to struct buf (still safe)

        atapi-cd casts to struct buf to examine B_PHYS

3 files changed, 10 insertions, 10 deletions

diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index f4c598eb1168..a7d31e4aad1a 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -826,7 +826,7 @@ swap_pager_strategy(vm_object_t object, struct buf *bp)
 		bp->b_error = EINVAL;
 		bp->b_ioflags |= BIO_ERROR;
 		bp->b_flags |= B_INVAL;
-		biodone(bp);
+		bufdone(bp);
 		printf("swap_pager_strategy: bp %p b_vp %p blk %d size %d, not page bounded\n", bp, bp->b_vp, (int)bp->b_pblkno, (int)bp->b_bcount);
 		return;
 	}
@@ -857,7 +857,7 @@ swap_pager_strategy(vm_object_t object, struct buf *bp)
 		swp_pager_meta_free(object, start, count);
 		splx(s);
 		bp->b_resid = 0;
-		biodone(bp);
+		bufdone(bp);
 		return;
 	}
 
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 5890024519e2..bf09d24f1bd6 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -269,7 +269,7 @@ vm_pager_strategy(vm_object_t object, struct buf *bp)
 	} else {
 		bp->b_ioflags |= BIO_ERROR;
 		bp->b_error = ENXIO;
-		biodone(bp);
+		bufdone(bp);
 	}
 }
 
@@ -518,7 +518,7 @@ vm_pager_chain_iodone(struct buf *nbp)
 				bp->b_ioflags |= BIO_ERROR;
 				bp->b_error = EINVAL;
 			}
-			biodone(bp);
+			bufdone(bp);
 		}
 	}
 	nbp->b_flags |= B_DONE;
@@ -568,7 +568,7 @@ flushchainbuf(struct buf *nbp)
 		BUF_KERNPROC(nbp);
 		BUF_STRATEGY(nbp);
 	} else {
-		biodone(nbp);
+		bufdone(nbp);
 	}
 }
 
@@ -587,7 +587,7 @@ waitchainbuf(struct buf *bp, int count, int done)
 			bp->b_ioflags |= BIO_ERROR;
 			bp->b_error = EINVAL;
 		}
-		biodone(bp);
+		bufdone(bp);
 	}
 	splx(s);
 }
@@ -599,7 +599,7 @@ autochaindone(struct buf *bp)
 
 	s = splbio();
 	if (bp->b_chain.count == 0)
-		biodone(bp);
+		bufdone(bp);
 	else
 		bp->b_flags |= B_AUTOCHAINDONE;
 	splx(s);
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 9df828fe4877..d6d6f7688fa1 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -105,7 +105,7 @@ swapdev_strategy(ap)
 		if (off + sz > dmmax) {
 			bp->b_error = EINVAL;
 			bp->b_ioflags |= BIO_ERROR;
-			biodone(bp);
+			bufdone(bp);
 			return 0;
 		}
 		seg = bp->b_blkno / dmmax;
@@ -119,14 +119,14 @@ swapdev_strategy(ap)
 	if (bp->b_blkno + sz > sp->sw_nblks) {
 		bp->b_error = EINVAL;
 		bp->b_ioflags |= BIO_ERROR;
-		biodone(bp);
+		bufdone(bp);
 		return 0;
 	}
 	bp->b_dev = sp->sw_device;
 	if (sp->sw_vp == NULL) {
 		bp->b_error = ENODEV;
 		bp->b_ioflags |= BIO_ERROR;
-		biodone(bp);
+		bufdone(bp);
 		return 0;
 	}