 @@ -1,14 +1,14 @@
-/*	$NetBSD: buf.c,v 1.12 2004/06/20 22:20:18 jmc Exp $	*/
+/*	$NetBSD: buf.c,v 1.13 2013/01/26 00:19:39 christos Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Luke Mewburn for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -31,87 +31,89 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: buf.c,v 1.12 2004/06/20 22:20:18 jmc Exp $");
+__RCSID("$NetBSD: buf.c,v 1.13 2013/01/26 00:19:39 christos Exp $");
 #endif	/* !__lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include "makefs.h"
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include "ffs/buf.h"
 #include "ffs/ufs_inode.h"
 extern int sectorsize;		/* XXX: from ffs.c & mkfs.c */
 TAILQ_HEAD(buftailhead,buf) buftail;
 int
-bread(int fd, struct fs *fs, daddr_t blkno, int size, struct buf **bpp)
+bread(struct vnode *vp, daddr_t blkno, int size, struct kauth_cred *u1 __unused,
    int u2 __unused, struct buf **bpp)
+{
 	off_t	offset;
 	ssize_t	rv;
 	struct fs *fs = vp->fs;
 	assert (fs != NULL);
 	assert (bpp != NULL);
 	if (debug & DEBUG_BUF_BREAD)
 		printf("bread: fs %p blkno %lld size %d\n",
 		    fs, (long long)blkno, size);
-	*bpp = getblk(fd, fs, blkno, size);
+	*bpp = getblk(vp, blkno, size, 0, 0);
 	offset = (*bpp)->b_blkno * sectorsize;	/* XXX */
 	if (debug & DEBUG_BUF_BREAD)
 		printf("bread: bp %p blkno %lld offset %lld bcount %ld\n",
 		    (*bpp), (long long)(*bpp)->b_blkno, (long long) offset,
 		    (*bpp)->b_bcount);
 	if (lseek((*bpp)->b_fd, offset, SEEK_SET) == -1)
 		err(1, "bread: lseek %lld (%lld)",
 		    (long long)(*bpp)->b_blkno, (long long)offset);
 	rv = read((*bpp)->b_fd, (*bpp)->b_data, (*bpp)->b_bcount);
 	if (debug & DEBUG_BUF_BREAD)
 		printf("bread: read %ld (%lld) returned %d\n",
 		    (*bpp)->b_bcount, (long long)offset, (int)rv);
 	if (rv == -1)				/* read error */
 		err(1, "bread: read %ld (%lld) returned %d",
 		    (*bpp)->b_bcount, (long long)offset, (int)rv);
 	else if (rv != (*bpp)->b_bcount)	/* short read */
 		err(1, "bread: read %ld (%lld) returned %d",
 		    (*bpp)->b_bcount, (long long)offset, (int)rv);
 	else
 		return (0);
+}
 void
-brelse(struct buf *bp)
+brelse(struct buf *bp, int u1 __unused)
+{
 	assert (bp != NULL);
 	assert (bp->b_data != NULL);
 	if (bp->b_lblkno < 0) {
 		/*
 		 * XXX	don't remove any buffers with negative logical block
 		 *	numbers (lblkno), so that we retain the mapping
 		 *	of negative lblkno -> real blkno that ffs_balloc()
 		 *	sets up.
+		 *
 		 *	if we instead released these buffers, and implemented
 @@ -170,32 +172,36 @@ bcleanup(void)
 	if (TAILQ_EMPTY(&buftail))
 		return;
 	printf("bcleanup: unflushed buffers:\n");
 	TAILQ_FOREACH(bp, &buftail, b_tailq) {
 		printf("\tlblkno %10lld  blkno %10lld  count %6ld  bufsize %6ld\n",
 		    (long long)bp->b_lblkno, (long long)bp->b_blkno,
 		    bp->b_bcount, bp->b_bufsize);
+	}
 	printf("bcleanup: done\n");
+}
 struct buf *
-getblk(int fd, struct fs *fs, daddr_t blkno, int size)
+getblk(struct vnode *vp, daddr_t blkno, int size, int u1 __unused,
     int u2 __unused)
+{
 	static int buftailinitted;
 	struct buf *bp;
 	void *n;
 	int fd = vp->fd;
 	struct fs *fs = vp->fs;
 	blkno += vp->offset;
 	assert (fs != NULL);
 	if (debug & DEBUG_BUF_GETBLK)
 		printf("getblk: fs %p blkno %lld size %d\n", fs,
 		    (long long)blkno, size);
 	bp = NULL;
 	if (!buftailinitted) {
 		if (debug & DEBUG_BUF_GETBLK)
 			printf("getblk: initialising tailq\n");
 		TAILQ_INIT(&buftail);
 		buftailinitted = 1;
 	} else {
 		TAILQ_FOREACH(bp, &buftail, b_tailq) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs_alloc.c,v 1.20 2013/01/22 09:39:19 dholland Exp $	*/
+/*	$NetBSD: ffs_alloc.c,v 1.21 2013/01/26 00:19:39 christos Exp $	*/
 /* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.
  * All rights reserved.
+ *
  * This software was developed for the FreeBSD Project by Marshall
  * Kirk McKusick and Network Associates Laboratories, the Security
  * Research Division of Network Associates, Inc. under DARPA/SPAWAR
  * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
  * research program
+ *
  * Copyright (c) 1982, 1986, 1989, 1993
 @@ -37,27 +37,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ffs_alloc.c	8.19 (Berkeley) 7/13/95
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_alloc.c,v 1.20 2013/01/22 09:39:19 dholland Exp $");
+__RCSID("$NetBSD: ffs_alloc.c,v 1.21 2013/01/26 00:19:39 christos Exp $");
 #endif	/* !__lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <errno.h>
 #include "makefs.h"
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ufs/ffs/fs.h>
 @@ -294,62 +294,63 @@ ffs_hashalloc(struct inode *ip, int cg,
+ *
  * Check to see if a block of the appropriate size is available,
  * and if it is, allocate it.
  */
 static daddr_t
 ffs_alloccg(struct inode *ip, int cg, daddr_t bpref, int size)
+{
 	struct cg *cgp;
 	struct buf *bp;
 	daddr_t bno, blkno;
 	int error, frags, allocsiz, i;
 	struct fs *fs = ip->i_fs;
 	const int needswap = UFS_FSNEEDSWAP(fs);
 	struct vnode vp = { ip->i_fd, ip->i_fs, NULL, 0 };
 	if (fs->fs_cs(fs, cg).cs_nbfree == 0 && size == fs->fs_bsize)
 		return (0);
-	error = bread(ip->i_fd, ip->i_fs, fsbtodb(fs, cgtod(fs, cg)),
+	error = bread(&vp, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize,
-		(int)fs->fs_cgsize, &bp);
+	    NULL, 0, &bp);
 	if (error) {
-		brelse(bp);
+		brelse(bp, 0);
 		return (0);
+	}
 	cgp = (struct cg *)bp->b_data;
 	if (!cg_chkmagic(cgp, needswap) ||
 	    (cgp->cg_cs.cs_nbfree == 0 && size == fs->fs_bsize)) {
-		brelse(bp);
+		brelse(bp, 0);
 		return (0);
+	}
 	if (size == fs->fs_bsize) {
 		bno = ffs_alloccgblk(ip, bp, bpref);
 		bdwrite(bp);
 		return (bno);
+	}
 	/*
 	 * check to see if any fragments are already available
 	 * allocsiz is the size which will be allocated, hacking
 	 * it down to a smaller size if necessary
 	 */
 	frags = numfrags(fs, size);
 	for (allocsiz = frags; allocsiz < fs->fs_frag; allocsiz++)
 		if (cgp->cg_frsum[allocsiz] != 0)
 			break;
 	if (allocsiz == fs->fs_frag) {
 		/*
 		 * no fragments were available, so a block will be
 		 * allocated, and hacked up
 		 */
 		if (cgp->cg_cs.cs_nbfree == 0) {
-			brelse(bp);
+			brelse(bp, 0);
 			return (0);
+		}
 		bno = ffs_alloccgblk(ip, bp, bpref);
 		bpref = dtogd(fs, bno);
 		for (i = frags; i < fs->fs_frag; i++)
 			setbit(cg_blksfree(cgp, needswap), bpref + i);
 		i = fs->fs_frag - frags;
 		ufs_add32(cgp->cg_cs.cs_nffree, i, needswap);
 		fs->fs_cstotal.cs_nffree += i;
 		fs->fs_cs(fs, cg).cs_nffree += i;
 		fs->fs_fmod = 1;
 		ufs_add32(cgp->cg_frsum[i], 1, needswap);
 		bdwrite(bp);
 @@ -429,47 +430,48 @@ gotit:
  * The specified block or fragment is placed back in the
  * free map. If a fragment is deallocated, a possible
  * block reassembly is checked.
  */
 void
 ffs_blkfree(struct inode *ip, daddr_t bno, long size)
+{
 	struct cg *cgp;
 	struct buf *bp;
 	int32_t fragno, cgbno;
 	int i, error, cg, blk, frags, bbase;
 	struct fs *fs = ip->i_fs;
 	const int needswap = UFS_FSNEEDSWAP(fs);
 	struct vnode vp = { ip->i_fd, ip->i_fs, NULL, 0 };
 	if (size > fs->fs_bsize || fragoff(fs, size) != 0 ||
 	    fragnum(fs, bno) + numfrags(fs, size) > fs->fs_frag) {
 		errx(1, "blkfree: bad size: bno %lld bsize %d size %ld",
 		    (long long)bno, fs->fs_bsize, size);
+	}
 	cg = dtog(fs, bno);
 	if (bno >= fs->fs_size) {
 		warnx("bad block %lld, ino %llu", (long long)bno,
 		    (unsigned long long)ip->i_number);
 		return;
+	}
-	error = bread(ip->i_fd, ip->i_fs, fsbtodb(fs, cgtod(fs, cg)),
+	error = bread(&vp, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize,
-		(int)fs->fs_cgsize, &bp);
+	    NULL, 0, &bp);
 	if (error) {
-		brelse(bp);
+		brelse(bp, 0);
 		return;
+	}
 	cgp = (struct cg *)bp->b_data;
 	if (!cg_chkmagic(cgp, needswap)) {
-		brelse(bp);
+		brelse(bp, 0);
 		return;
+	}
 	cgbno = dtogd(fs, bno);
 	if (size == fs->fs_bsize) {
 		fragno = fragstoblks(fs, cgbno);
 		if (!ffs_isfreeblock(fs, cg_blksfree(cgp, needswap), fragno)) {
 			errx(1, "blkfree: freeing free block %lld",
 			    (long long)bno);
+		}
 		ffs_setblock(fs, cg_blksfree(cgp, needswap), fragno);
 		ffs_clusteracct(fs, cgp, fragno, 1);
 		ufs_add32(cgp->cg_cs.cs_nbfree, 1, needswap);
 		fs->fs_cstotal.cs_nbfree++;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs_balloc.c,v 1.14 2013/01/22 09:39:19 dholland Exp $	*/
+/*	$NetBSD: ffs_balloc.c,v 1.15 2013/01/26 00:19:39 christos Exp $	*/
 /* From NetBSD: ffs_balloc.c,v 1.25 2001/08/08 08:36:36 lukem Exp */
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -28,27 +28,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ffs_balloc.c	8.8 (Berkeley) 6/16/95
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_balloc.c,v 1.14 2013/01/22 09:39:19 dholland Exp $");
+__RCSID("$NetBSD: ffs_balloc.c,v 1.15 2013/01/26 00:19:39 christos Exp $");
 #endif	/* !__lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "makefs.h"
 @@ -85,26 +85,27 @@ ffs_balloc_ufs1(struct inode *ip, off_t
+{
 	daddr_t lbn, lastlbn;
 	int size;
 	int32_t nb;
 	struct buf *bp, *nbp;
 	struct fs *fs = ip->i_fs;
 	struct indir indirs[UFS_NIADDR + 2];
 	daddr_t newb, pref;
 	int32_t *bap;
 	int osize, nsize, num, i, error;
 	int32_t *allocblk, allociblk[UFS_NIADDR + 1];
 	int32_t *allocib;
 	const int needswap = UFS_FSNEEDSWAP(fs);
 	struct vnode vp = { ip->i_fd, ip->i_fs, NULL, 0 };
 	lbn = lblkno(fs, offset);
 	size = blkoff(fs, offset) + bufsize;
 	if (bpp != NULL) {
 		*bpp = NULL;
+	}
 	assert(size <= fs->fs_bsize);
 	if (lbn < 0)
 		return (EFBIG);
 	/*
 	 * If the next write will extend the file into a new block,
 @@ -128,83 +129,83 @@ ffs_balloc_ufs1(struct inode *ip, off_t
 	if (lbn < UFS_NDADDR) {
 		nb = ufs_rw32(ip->i_ffs1_db[lbn], needswap);
 		if (nb != 0 && ip->i_ffs1_size >= lblktosize(fs, lbn + 1)) {
 			/*
 			 * The block is an already-allocated direct block
 			 * and the file already extends past this block,
 			 * thus this must be a whole block.
 			 * Just read the block (if requested).
 			 */
 			if (bpp != NULL) {
-				error = bread(ip->i_fd, ip->i_fs, lbn,
+				error = bread(&vp, lbn, fs->fs_bsize, NULL, 0,
-				    fs->fs_bsize, bpp);
+				    bpp);
 				if (error) {
-					brelse(*bpp);
+					brelse(*bpp, 0);
 					return (error);
+				}
+			}
 			return (0);
+		}
 		if (nb != 0) {
 			/*
 			 * Consider need to reallocate a fragment.
 			 */
 			osize = fragroundup(fs, blkoff(fs, ip->i_ffs1_size));
 			nsize = fragroundup(fs, size);
 			if (nsize <= osize) {
 				/*
 				 * The existing block is already
 				 * at least as big as we want.
 				 * Just read the block (if requested).
 				 */
 				if (bpp != NULL) {
-					error = bread(ip->i_fd, ip->i_fs, lbn,
+					error = bread(&vp, lbn, osize, NULL, 0,
-					    osize, bpp);
+					    bpp);
 					if (error) {
-						brelse(*bpp);
+						brelse(*bpp, 0);
 						return (error);
+					}
+				}
 				return 0;
 			} else {
 				warnx("need to ffs_realloccg; not supported!");
 				abort();
+			}
 		} else {
 			/*
 			 * the block was not previously allocated,
 			 * allocate a new block or fragment.
 			 */
 			if (ip->i_ffs1_size < lblktosize(fs, lbn + 1))
 				nsize = fragroundup(fs, size);
 			else
 				nsize = fs->fs_bsize;
 			error = ffs_alloc(ip, lbn,
 			    ffs_blkpref_ufs1(ip, lbn, (int)lbn,
 				&ip->i_ffs1_db[0]),
 				nsize, &newb);
 			if (error)
 				return (error);
 			if (bpp != NULL) {
-				bp = getblk(ip->i_fd, ip->i_fs, lbn, nsize);
+				bp = getblk(&vp, lbn, nsize, 0, 0);
 				bp->b_blkno = fsbtodb(fs, newb);
 				clrbuf(bp);
 				*bpp = bp;
+			}
+		}
 		ip->i_ffs1_db[lbn] = ufs_rw32((int32_t)newb, needswap);
 		return (0);
+	}
 	/*
 	 * Determine the number of levels of indirection.
 	 */
 @@ -222,140 +223,140 @@ ffs_balloc_ufs1(struct inode *ip, off_t
 	 */
 	--num;
 	nb = ufs_rw32(ip->i_ffs1_ib[indirs[0].in_off], needswap);
 	allocib = NULL;
 	allocblk = allociblk;
 	if (nb == 0) {
 		pref = ffs_blkpref_ufs1(ip, lbn, 0, (int32_t *)0);
 		error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, &newb);
 		if (error)
 			return error;
 		nb = newb;
 		*allocblk++ = nb;
-		bp = getblk(ip->i_fd, ip->i_fs, indirs[1].in_lbn, fs->fs_bsize);
+		bp = getblk(&vp, indirs[1].in_lbn, fs->fs_bsize, 0, 0);
 		bp->b_blkno = fsbtodb(fs, nb);
 		clrbuf(bp);
 		/*
 		 * Write synchronously so that indirect blocks
 		 * never point at garbage.
 		 */
 		if ((error = bwrite(bp)) != 0)
 			return error;
 		allocib = &ip->i_ffs1_ib[indirs[0].in_off];
 		*allocib = ufs_rw32((int32_t)nb, needswap);
+	}
 	/*
 	 * Fetch through the indirect blocks, allocating as necessary.
 	 */
 	for (i = 1;;) {
-		error = bread(ip->i_fd, ip->i_fs, indirs[i].in_lbn,
+		error = bread(&vp, indirs[i].in_lbn, fs->fs_bsize, NULL, 0,
-		    fs->fs_bsize, &bp);
+		    &bp);
 		if (error) {
-			brelse(bp);
+			brelse(bp, 0);
 			return error;
+		}
 		bap = (int32_t *)bp->b_data;
 		nb = ufs_rw32(bap[indirs[i].in_off], needswap);
 		if (i == num)
 			break;
 		i++;
 		if (nb != 0) {
-			brelse(bp);
+			brelse(bp, 0);
 			continue;
+		}
 		if (pref == 0)
 			pref = ffs_blkpref_ufs1(ip, lbn, 0, (int32_t *)0);
 		error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, &newb);
 		if (error) {
-			brelse(bp);
+			brelse(bp, 0);
 			return error;
+		}
 		nb = newb;
 		*allocblk++ = nb;
-		nbp = getblk(ip->i_fd, ip->i_fs, indirs[i].in_lbn,
+		nbp = getblk(&vp, indirs[i].in_lbn, fs->fs_bsize, 0, 0);
 		    fs->fs_bsize);
 		nbp->b_blkno = fsbtodb(fs, nb);
 		clrbuf(nbp);
 		/*
 		 * Write synchronously so that indirect blocks
 		 * never point at garbage.
 		 */
 		if ((error = bwrite(nbp)) != 0) {
-			brelse(bp);
+			brelse(bp, 0);
 			return error;
+		}
 		bap[indirs[i - 1].in_off] = ufs_rw32(nb, needswap);
 		bwrite(bp);
+	}
 	/*
 	 * Get the data block, allocating if necessary.
 	 */
 	if (nb == 0) {
 		pref = ffs_blkpref_ufs1(ip, lbn, indirs[num].in_off, &bap[0]);
 		error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, &newb);
 		if (error) {
-			brelse(bp);
+			brelse(bp, 0);
 			return error;
+		}
 		nb = newb;
 		*allocblk++ = nb;
 		if (bpp != NULL) {
-			nbp = getblk(ip->i_fd, ip->i_fs, lbn, fs->fs_bsize);
+			nbp = getblk(&vp, lbn, fs->fs_bsize, 0, 0);
 			nbp->b_blkno = fsbtodb(fs, nb);
 			clrbuf(nbp);
 			*bpp = nbp;
+		}
 		bap[indirs[num].in_off] = ufs_rw32(nb, needswap);
 		/*
 		 * If required, write synchronously, otherwise use
 		 * delayed write.
 		 */
 		bwrite(bp);
 		return (0);
+	}
-	brelse(bp);
+	brelse(bp, 0);
 	if (bpp != NULL) {
-		error = bread(ip->i_fd, ip->i_fs, lbn, (int)fs->fs_bsize, &nbp);
+		error = bread(&vp, lbn, (int)fs->fs_bsize, NULL, 0, &nbp);
 		if (error) {
-			brelse(nbp);
+			brelse(nbp, 0);
 			return error;
+		}
 		*bpp = nbp;
+	}
 	return (0);
+}
 static int
 ffs_balloc_ufs2(struct inode *ip, off_t offset, int bufsize, struct buf **bpp)
+{
 	daddr_t lbn, lastlbn;
 	int size;
 	struct buf *bp, *nbp;
 	struct fs *fs = ip->i_fs;
 	struct indir indirs[UFS_NIADDR + 2];
 	daddr_t newb, pref, nb;
 	int64_t *bap;
 	int osize, nsize, num, i, error;
 	int64_t *allocblk, allociblk[UFS_NIADDR + 1];
 	int64_t *allocib;
 	const int needswap = UFS_FSNEEDSWAP(fs);
 	struct vnode vp = { ip->i_fd, ip->i_fs, NULL, 0 };
 	lbn = lblkno(fs, offset);
 	size = blkoff(fs, offset) + bufsize;
 	if (bpp != NULL) {
 		*bpp = NULL;
+	}
 	assert(size <= fs->fs_bsize);
 	if (lbn < 0)
 		return (EFBIG);
 	/*
 	 * If the next write will extend the file into a new block,
 @@ -379,83 +380,83 @@ ffs_balloc_ufs2(struct inode *ip, off_t
 	if (lbn < UFS_NDADDR) {
 		nb = ufs_rw64(ip->i_ffs2_db[lbn], needswap);
 		if (nb != 0 && ip->i_ffs2_size >= lblktosize(fs, lbn + 1)) {
 			/*
 			 * The block is an already-allocated direct block
 			 * and the file already extends past this block,
 			 * thus this must be a whole block.
 			 * Just read the block (if requested).
 			 */
 			if (bpp != NULL) {
-				error = bread(ip->i_fd, ip->i_fs, lbn,
+				error = bread(&vp, lbn, fs->fs_bsize, NULL, 0,
-				    fs->fs_bsize, bpp);
+				    bpp);
 				if (error) {
-					brelse(*bpp);
+					brelse(*bpp, 0);
 					return (error);
+				}
+			}
 			return (0);
+		}
 		if (nb != 0) {
 			/*
 			 * Consider need to reallocate a fragment.
 			 */
 			osize = fragroundup(fs, blkoff(fs, ip->i_ffs2_size));
 			nsize = fragroundup(fs, size);
 			if (nsize <= osize) {
 				/*
 				 * The existing block is already
 				 * at least as big as we want.
 				 * Just read the block (if requested).
 				 */
 				if (bpp != NULL) {
-					error = bread(ip->i_fd, ip->i_fs, lbn,
+					error = bread(&vp, lbn, osize, NULL, 0,
-					    osize, bpp);
+					    bpp);
 					if (error) {
-						brelse(*bpp);
+						brelse(*bpp, 0);
 						return (error);
+					}
+				}
 				return 0;
 			} else {
 				warnx("need to ffs_realloccg; not supported!");
 				abort();
+			}
 		} else {
 			/*
 			 * the block was not previously allocated,
 			 * allocate a new block or fragment.
 			 */
 			if (ip->i_ffs2_size < lblktosize(fs, lbn + 1))
 				nsize = fragroundup(fs, size);
 			else
 				nsize = fs->fs_bsize;
 			error = ffs_alloc(ip, lbn,
 			    ffs_blkpref_ufs2(ip, lbn, (int)lbn,
 				&ip->i_ffs2_db[0]),
 				nsize, &newb);
 			if (error)
 				return (error);
 			if (bpp != NULL) {
-				bp = getblk(ip->i_fd, ip->i_fs, lbn, nsize);
+				bp = getblk(&vp, lbn, nsize, 0, 0);
 				bp->b_blkno = fsbtodb(fs, newb);
 				clrbuf(bp);
 				*bpp = bp;
+			}
+		}
 		ip->i_ffs2_db[lbn] = ufs_rw64(newb, needswap);
 		return (0);
+	}
 	/*
 	 * Determine the number of levels of indirection.
 	 */
 @@ -473,112 +474,111 @@ ffs_balloc_ufs2(struct inode *ip, off_t
 	 */
 	--num;
 	nb = ufs_rw64(ip->i_ffs2_ib[indirs[0].in_off], needswap);
 	allocib = NULL;
 	allocblk = allociblk;
 	if (nb == 0) {
 		pref = ffs_blkpref_ufs2(ip, lbn, 0, (int64_t *)0);
 		error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, &newb);
 		if (error)
 			return error;
 		nb = newb;
 		*allocblk++ = nb;
-		bp = getblk(ip->i_fd, ip->i_fs, indirs[1].in_lbn, fs->fs_bsize);
+		bp = getblk(&vp, indirs[1].in_lbn, fs->fs_bsize, 0, 0);
 		bp->b_blkno = fsbtodb(fs, nb);
 		clrbuf(bp);
 		/*
 		 * Write synchronously so that indirect blocks
 		 * never point at garbage.
 		 */
 		if ((error = bwrite(bp)) != 0)
 			return error;
 		allocib = &ip->i_ffs2_ib[indirs[0].in_off];
 		*allocib = ufs_rw64(nb, needswap);
+	}
 	/*
 	 * Fetch through the indirect blocks, allocating as necessary.
 	 */
 	for (i = 1;;) {
-		error = bread(ip->i_fd, ip->i_fs, indirs[i].in_lbn,
+		error = bread(&vp, indirs[i].in_lbn, fs->fs_bsize, NULL, 0,
-		    fs->fs_bsize, &bp);
+		    &bp);
 		if (error) {
-			brelse(bp);
+			brelse(bp, 0);
 			return error;
+		}
 		bap = (int64_t *)bp->b_data;
 		nb = ufs_rw64(bap[indirs[i].in_off], needswap);
 		if (i == num)
 			break;
 		i++;
 		if (nb != 0) {
-			brelse(bp);
+			brelse(bp, 0);
 			continue;
+		}
 		if (pref == 0)
 			pref = ffs_blkpref_ufs2(ip, lbn, 0, (int64_t *)0);
 		error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, &newb);
 		if (error) {
-			brelse(bp);
+			brelse(bp, 0);
 			return error;
+		}
 		nb = newb;
 		*allocblk++ = nb;
-		nbp = getblk(ip->i_fd, ip->i_fs, indirs[i].in_lbn,
+		nbp = getblk(&vp, indirs[i].in_lbn, fs->fs_bsize, 0, 0);
 		    fs->fs_bsize);
 		nbp->b_blkno = fsbtodb(fs, nb);
 		clrbuf(nbp);
 		/*
 		 * Write synchronously so that indirect blocks
 		 * never point at garbage.
 		 */
 		if ((error = bwrite(nbp)) != 0) {
-			brelse(bp);
+			brelse(bp, 0);
 			return error;
+		}
 		bap[indirs[i - 1].in_off] = ufs_rw64(nb, needswap);
 		bwrite(bp);
+	}
 	/*
 	 * Get the data block, allocating if necessary.
 	 */
 	if (nb == 0) {
 		pref = ffs_blkpref_ufs2(ip, lbn, indirs[num].in_off, &bap[0]);
 		error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, &newb);
 		if (error) {
-			brelse(bp);
+			brelse(bp, 0);
 			return error;
+		}
 		nb = newb;
 		*allocblk++ = nb;
 		if (bpp != NULL) {
-			nbp = getblk(ip->i_fd, ip->i_fs, lbn, fs->fs_bsize);
+			nbp = getblk(&vp, lbn, fs->fs_bsize, 0, 0);
 			nbp->b_blkno = fsbtodb(fs, nb);
 			clrbuf(nbp);
 			*bpp = nbp;
+		}
 		bap[indirs[num].in_off] = ufs_rw64(nb, needswap);
 		/*
 		 * If required, write synchronously, otherwise use
 		 * delayed write.
 		 */
 		bwrite(bp);
 		return (0);
+	}
-	brelse(bp);
+	brelse(bp, 0);
 	if (bpp != NULL) {
-		error = bread(ip->i_fd, ip->i_fs, lbn, (int)fs->fs_bsize, &nbp);
+		error = bread(&vp, lbn, (int)fs->fs_bsize, NULL, 0, &nbp);
 		if (error) {
-			brelse(nbp);
+			brelse(nbp, 0);
 			return error;
+		}
 		*bpp = nbp;
+	}
 	return (0);
+}