bread does nothing with its ucred argument. remove it. ok matthew

31 files changed, 134 insertions, 152 deletions

diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index c7ec832e832..fc4ce856721 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_lookup.c,v 1.17 2010/01/17 20:25:58 chl Exp $	*/
+/*	$OpenBSD: cd9660_lookup.c,v 1.18 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: cd9660_lookup.c,v 1.18 1997/05/08 16:19:59 mycroft Exp $	*/
 
 /*-
@@ -438,7 +438,7 @@ cd9660_bufatoff(struct iso_node *ip, off_t offset, char **res,
 	lbn = lblkno(imp, offset);
 	bsize = blksize(imp, ip, lbn);
 	
-	if ((error = bread(vp, lbn, bsize, NOCRED, &bp)) != 0) {
+	if ((error = bread(vp, lbn, bsize, &bp)) != 0) {
 		brelse(bp);
 		*bpp = NULL;
 		return (error);
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index ef4d61026a6..fdf2a18b54e 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_rrip.c,v 1.9 2007/02/14 00:53:48 jsg Exp $	*/
+/*	$OpenBSD: cd9660_rrip.c,v 1.10 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: cd9660_rrip.c,v 1.17 1997/01/24 00:27:32 cgd Exp $	*/
 
 /*-
@@ -590,7 +590,7 @@ cd9660_rrip_loop(isodir, ana, table)
 			    ana->imp->logical_block_size ||
 			    bread(ana->imp->im_devvp, ana->iso_ce_blk <<
 			    (ana->imp->im_bshift - DEV_BSHIFT),
-			    ana->imp->logical_block_size, NOCRED, &bp))
+			    ana->imp->logical_block_size, &bp))
 				/* what to do now? */
 				break;
 			phead =
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 2f33e089520..c5b77a1ecdd 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vfsops.c,v 1.58 2011/04/16 03:21:15 krw Exp $	*/
+/*	$OpenBSD: cd9660_vfsops.c,v 1.59 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $	*/
 
 /*-
@@ -283,7 +283,7 @@ iso_mountfs(devvp, mp, p, argp)
 	for (iso_blknum = 16; iso_blknum < 100; iso_blknum++) {
 		if ((error = bread(devvp,
 		    (iso_blknum + sess) * btodb(iso_bsize),
-		    iso_bsize, NOCRED, &bp)) != 0)
+		    iso_bsize, &bp)) != 0)
 			goto out;
 		
 		vdp = (struct iso_volume_descriptor *)bp->b_data;
@@ -386,7 +386,7 @@ iso_mountfs(devvp, mp, p, argp)
 		if ((error = bread(isomp->im_devvp, (isomp->root_extent +
 		    isonum_711(rootp->ext_attr_length)) <<
 		    (isomp->im_bshift - DEV_BSHIFT),
-		    isomp->logical_block_size, NOCRED, &bp)) != 0)
+		    isomp->logical_block_size, &bp)) != 0)
 			goto out;
 		
 		rootp = (struct iso_directory_record *)bp->b_data;
@@ -815,7 +815,7 @@ retry:
 	
 		error = bread(imp->im_devvp,
 			      lbn << (imp->im_bshift - DEV_BSHIFT),
-			      imp->logical_block_size, NOCRED, &bp);
+			      imp->logical_block_size, &bp);
 		if (error) {
 			vput(vp);
 			brelse(bp);
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 39132e4d679..43e3a37f2cc 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vnops.c,v 1.53 2011/04/05 14:14:07 thib Exp $	*/
+/*	$OpenBSD: cd9660_vnops.c,v 1.54 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $	*/
 
 /*-
@@ -326,10 +326,10 @@ cd9660_read(v)
 				ra->sizes[i] = blksize(imp, ip, rablock + i);
 			}
 			error = breadn(vp, lbn, size, ra->blks,
-			    ra->sizes, i, NOCRED, &bp);
+			    ra->sizes, i, &bp);
 			free(ra, M_TEMP);
 		} else
-			error = bread(vp, lbn, size, NOCRED, &bp);
+			error = bread(vp, lbn, size, &bp);
 		ci->ci_lastr = lbn;
 		n = min(n, size - bp->b_resid);
 		if (error) {
@@ -700,7 +700,7 @@ cd9660_readlink(v)
 	error = bread(imp->im_devvp,
 		      (ip->i_number >> imp->im_bshift) <<
 		      (imp->im_bshift - DEV_BSHIFT),
-		      imp->logical_block_size, NOCRED, &bp);
+		      imp->logical_block_size, &bp);
 	if (error) {
 		brelse(bp);
 		return (EINVAL);
diff --git a/sys/isofs/udf/udf.h b/sys/isofs/udf/udf.h
index bd049a50d3e..6a3c18f5df0 100644
--- a/sys/isofs/udf/udf.h
+++ b/sys/isofs/udf/udf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf.h,v 1.13 2009/08/14 22:23:45 krw Exp $	*/
+/*	$OpenBSD: udf.h,v 1.14 2011/07/04 04:30:41 tedu Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -104,7 +104,7 @@ struct udf_dirstream {
  * Can the block layer be forced to use a different block size?
  */
 #define	RDSECTOR(devvp, sector, size, bp) \
-	bread(devvp, sector << (ump->um_bshift - DEV_BSHIFT), size, NOCRED, bp)
+	bread(devvp, sector << (ump->um_bshift - DEV_BSHIFT), size, bp)
 
 static __inline int
 udf_readlblks(struct umount *ump, int sector, int size, struct buf **bp)
diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c
index 7021039168b..e48b4b1318e 100644
--- a/sys/isofs/udf/udf_vfsops.c
+++ b/sys/isofs/udf/udf_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf_vfsops.c,v 1.36 2010/12/21 20:14:43 thib Exp $	*/
+/*	$OpenBSD: udf_vfsops.c,v 1.37 2011/07/04 04:30:41 tedu Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -270,8 +270,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp, uint32_t lb, struct proc *p)
 	 * Should also check sector n - 256, n, and 512.
 	 */
 	sector = 256;
-	if ((error = bread(devvp, sector * btodb(bsize), bsize, NOCRED,
-			   &bp)) != 0)
+	if ((error = bread(devvp, sector * btodb(bsize), bsize, &bp)) != 0)
 		goto bail;
 	if ((error = udf_checktag((struct desc_tag *)bp->b_data, TAGID_ANCHOR)))
 		goto bail;
@@ -290,7 +289,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp, uint32_t lb, struct proc *p)
 	mvds_end = mvds_start + (letoh32(avdp.main_vds_ex.len) - 1) / bsize;
 	for (sector = mvds_start; sector < mvds_end; sector++) {
 		if ((error = bread(devvp, sector * btodb(bsize), bsize, 
-				   NOCRED, &bp)) != 0) {
+				   &bp)) != 0) {
 			printf("Can't read sector %d of VDS\n", sector);
 			goto bail;
 		}
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index cb6a13a8e5b..dca9a50fb45 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.62 2011/04/05 14:14:07 thib Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.63 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -240,9 +240,9 @@ spec_read(void *v)
 			if (vp->v_lastr + bscale == bn) {
 				nextbn = bn + bscale;
 				error = breadn(vp, bn, bsize, &nextbn, &bsize,
-				    1, NOCRED, &bp);
+				    1, &bp);
 			} else
-				error = bread(vp, bn, bsize, NOCRED, &bp);
+				error = bread(vp, bn, bsize, &bp);
 			vp->v_lastr = bn;
 			n = min(n, bsize - bp->b_resid);
 			if (error) {
@@ -325,7 +325,7 @@ spec_write(void *v)
 			bn = btodb(uio->uio_offset) & ~(bscale - 1);
 			on = uio->uio_offset % bsize;
 			n = min((bsize - on), uio->uio_resid);
-			error = bread(vp, bn, bsize, NOCRED, &bp);
+			error = bread(vp, bn, bsize, &bp);
 			n = min(n, bsize - bp->b_resid);
 			if (error) {
 				brelse(bp);
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index fb3acc990a7..6a6b1734dcc 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_bio.c,v 1.130 2011/06/05 19:41:04 deraadt Exp $	*/
+/*	$OpenBSD: vfs_bio.c,v 1.131 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $	*/
 
 /*
@@ -403,8 +403,7 @@ bio_doread(struct vnode *vp, daddr64_t blkno, int size, int async)
  * This algorithm described in Bach (p.54).
  */
 int
-bread(struct vnode *vp, daddr64_t blkno, int size, struct ucred *cred,
-    struct buf **bpp)
+bread(struct vnode *vp, daddr64_t blkno, int size, struct buf **bpp)
 {
 	struct buf *bp;
 
@@ -421,7 +420,7 @@ bread(struct vnode *vp, daddr64_t blkno, int size, struct ucred *cred,
  */
 int
 breadn(struct vnode *vp, daddr64_t blkno, int size, daddr64_t rablks[],
-    int rasizes[], int nrablks, struct ucred *cred, struct buf **bpp)
+    int rasizes[], int nrablks, struct buf **bpp)
 {
 	struct buf *bp;
 	int i;
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 7d31ed887a2..2f0634dae87 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_cluster.c,v 1.37 2007/05/26 20:26:51 pedro Exp $	*/
+/*	$OpenBSD: vfs_cluster.c,v 1.38 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $	*/
 
 /*
@@ -235,7 +235,7 @@ cluster_collectbufs(struct vnode *vp, struct cluster_info *ci,
 	buflist->bs_nchildren = 0;
 	buflist->bs_children = (struct buf **)(buflist + 1);
 	for (lbn = ci->ci_cstart, i = 0; i < len; lbn++, i++)
-		(void)bread(vp, lbn, last_bp->b_bcount, NOCRED,
+		(void)bread(vp, lbn, last_bp->b_bcount,
 		    &buflist->bs_children[i]);
 	buflist->bs_children[i] = last_bp;
 	buflist->bs_nchildren = i + 1;
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index cb6a13a8e5b..dca9a50fb45 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.62 2011/04/05 14:14:07 thib Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.63 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -240,9 +240,9 @@ spec_read(void *v)
 			if (vp->v_lastr + bscale == bn) {
 				nextbn = bn + bscale;
 				error = breadn(vp, bn, bsize, &nextbn, &bsize,
-				    1, NOCRED, &bp);
+				    1, &bp);
 			} else
-				error = bread(vp, bn, bsize, NOCRED, &bp);
+				error = bread(vp, bn, bsize, &bp);
 			vp->v_lastr = bn;
 			n = min(n, bsize - bp->b_resid);
 			if (error) {
@@ -325,7 +325,7 @@ spec_write(void *v)
 			bn = btodb(uio->uio_offset) & ~(bscale - 1);
 			on = uio->uio_offset % bsize;
 			n = min((bsize - on), uio->uio_resid);
-			error = bread(vp, bn, bsize, NOCRED, &bp);
+			error = bread(vp, bn, bsize, &bp);
 			n = min(n, bsize - bp->b_resid);
 			if (error) {
 				brelse(bp);
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 1aa3c82400e..6d33b9f6be2 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_denode.c,v 1.42 2010/12/21 20:14:43 thib Exp $	*/
+/*	$OpenBSD: msdosfs_denode.c,v 1.43 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $	*/
 
 /*-
@@ -430,12 +430,10 @@ detrunc(struct denode *dep, uint32_t length, int flags, struct ucred *cred,
 	if ((boff = length & pmp->pm_crbomask) != 0) {
 		if (isadir) {
 			bn = cntobn(pmp, eofentry);
-			error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster,
-			    NOCRED, &bp);
+			error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster, &bp);
 		} else {
 			bn = de_blk(pmp, length);
-			error = bread(DETOV(dep), bn, pmp->pm_bpcluster,
-			    NOCRED, &bp);
+			error = bread(DETOV(dep), bn, pmp->pm_bpcluster, &bp);
 		}
 		if (error) {
 			brelse(bp);
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index 167e56eac84..929ac9a4748 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_fat.c,v 1.21 2009/08/13 22:34:29 jasper Exp $	*/
+/*	$OpenBSD: msdosfs_fat.c,v 1.22 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: msdosfs_fat.c,v 1.26 1997/10/17 11:24:02 ws Exp $	*/
 
 /*-
@@ -215,7 +215,7 @@ pcbmap(struct denode *dep, uint32_t findcn, daddr64_t *bnp, uint32_t *cnp,
 		if (bn != bp_bn) {
 			if (bp)
 				brelse(bp);
-			error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
+			error = bread(pmp->pm_devvp, bn, bsize, &bp);
 			if (error) {
 				brelse(bp);
 				return (error);
@@ -331,7 +331,7 @@ updatefats(struct msdosfsmount *pmp, struct buf *bp, uint32_t fatbn)
 	 * If we have an FSInfo block, update it.
 	 */
 	if (pmp->pm_fsinfo) {
-		if (bread(pmp->pm_devvp, pmp->pm_fsinfo, fsi_size(pmp), NOCRED,
+		if (bread(pmp->pm_devvp, pmp->pm_fsinfo, fsi_size(pmp),
 		    &bpn) != 0) {
 			/*
 			 * Ignore the error, but turn off FSInfo update for the future.
@@ -501,7 +501,7 @@ fatentry(int function, struct msdosfsmount *pmp, uint32_t cn, uint32_t *oldconte
 
 	byteoffset = FATOFS(pmp, cn);
 	fatblock(pmp, byteoffset, &bn, &bsize, &bo);
-	if ((error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp)) != 0) {
+	if ((error = bread(pmp->pm_devvp, bn, bsize, &bp)) != 0) {
 		brelse(bp);
 		return (error);
 	}
@@ -583,7 +583,7 @@ fatchain(struct msdosfsmount *pmp, uint32_t start, uint32_t count, uint32_t fill
 	while (count > 0) {
 		byteoffset = FATOFS(pmp, start);
 		fatblock(pmp, byteoffset, &bn, &bsize, &bo);
-		error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
+		error = bread(pmp->pm_devvp, bn, bsize, &bp);
 		if (error) {
 			brelse(bp);
 			return (error);
@@ -809,7 +809,7 @@ freeclusterchain(struct msdosfsmount *pmp, uint32_t cluster)
 		if (lbn != bn) {
 			if (bp)
 				updatefats(pmp, bp, lbn);
-			error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
+			error = bread(pmp->pm_devvp, bn, bsize, &bp);
 			if (error) {
 				brelse(bp);
 				return (error);
@@ -883,7 +883,7 @@ fillinusemap(struct msdosfsmount *pmp)
 			if (bp)
 				brelse(bp);
 			fatblock(pmp, byteoffset, &bn, &bsize, NULL);
-			error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
+			error = bread(pmp->pm_devvp, bn, bsize, &bp);
 			if (error) {
 				brelse(bp);
 				return (error);
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index 74a6a442653..a54839b1819 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_lookup.c,v 1.23 2010/01/17 20:23:58 chl Exp $	*/
+/*	$OpenBSD: msdosfs_lookup.c,v 1.24 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: msdosfs_lookup.c,v 1.34 1997/10/18 22:12:27 ws Exp $	*/
 
 /*-
@@ -231,7 +231,7 @@ msdosfs_lookup(void *v)
 				break;
 			return (error);
 		}
-		error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp);
+		error = bread(pmp->pm_devvp, bn, blsize, &bp);
 		if (error) {
 			brelse(bp);
 			return (error);
@@ -643,7 +643,7 @@ createde(struct denode *dep, struct denode *ddep, struct denode **depp,
 	diroffset = ddep->de_fndoffset;
 	if (dirclust != MSDOSFSROOT)
 		diroffset &= pmp->pm_crbomask;
-	if ((error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp)) != 0) {
+	if ((error = bread(pmp->pm_devvp, bn, blsize, &bp)) != 0) {
 		brelse(bp);
 		return error;
 	}
@@ -673,8 +673,7 @@ createde(struct denode *dep, struct denode *ddep, struct denode **depp,
 				if (error)
 					return error;
 
-				error = bread(pmp->pm_devvp, bn, blsize,
-					      NOCRED, &bp);
+				error = bread(pmp->pm_devvp, bn, blsize, &bp);
 				if (error) {
 					brelse(bp);
 					return error;
@@ -737,7 +736,7 @@ dosdirempty(struct denode *dep)
 				return (1);	/* it's empty */
 			return (0);
 		}
-		error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp);
+		error = bread(pmp->pm_devvp, bn, blsize, &bp);
 		if (error) {
 			brelse(bp);
 			return (0);
@@ -828,7 +827,7 @@ doscheckpath(struct denode *source, struct denode *target)
 		}
 		scn = dep->de_StartCluster;
 		error = bread(pmp->pm_devvp, cntobn(pmp, scn),
-			      pmp->pm_bpcluster, NOCRED, &bp);
+			      pmp->pm_bpcluster, &bp);
 		if (error)
 			break;
 
@@ -891,7 +890,7 @@ readep(struct msdosfsmount *pmp, uint32_t dirclust, uint32_t diroffset,
 	    && de_blk(pmp, diroffset + blsize) > pmp->pm_rootdirsize)
 		blsize = de_bn2off(pmp, pmp->pm_rootdirsize) & pmp->pm_crbomask;
 	bn = detobn(pmp, dirclust, diroffset);
-	if ((error = bread(pmp->pm_devvp, bn, blsize, NOCRED, bpp)) != 0) {
+	if ((error = bread(pmp->pm_devvp, bn, blsize, bpp)) != 0) {
 		brelse(*bpp);
 		*bpp = NULL;
 		return (error);
@@ -948,7 +947,7 @@ removede(struct denode *pdep, struct denode *dep)
 		error = pcbmap(pdep, de_cluster(pmp, offset), &bn, 0, &blsize);
 		if (error)
 			return error;
-		error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp);
+		error = bread(pmp->pm_devvp, bn, blsize, &bp);
 		if (error) {
 			brelse(bp);
 			return error;
@@ -1018,7 +1017,7 @@ uniqdosname(struct denode *dep, struct componentname *cnp, u_char *cp)
 					return 0;
 				return error;
 			}
-			error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp);
+			error = bread(pmp->pm_devvp, bn, blsize, &bp);
 			if (error) {
 				brelse(bp);
 				return error;
@@ -1070,7 +1069,7 @@ findwin95(struct denode *dep)
 	for (cn = 0;; cn++) {
 		if (pcbmap(dep, cn, &bn, 0, &blsize))
 			return 0;
-		if (bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp)) {
+		if (bread(pmp->pm_devvp, bn, blsize, &bp)) {
 			brelse(bp);
 			return 0;
 		}
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index d5412e3df9b..0591459e0e0 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vfsops.c,v 1.59 2010/11/17 12:27:03 jsing Exp $	*/
+/*	$OpenBSD: msdosfs_vfsops.c,v 1.60 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $	*/
 
 /*-
@@ -308,7 +308,7 @@ msdosfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
 	 * Read the boot sector of the filesystem, and then check the
 	 * boot signature.  If not a dos boot sector then error out.
 	 */
-	if ((error = bread(devvp, 0, 4096, NOCRED, &bp)) != 0)
+	if ((error = bread(devvp, 0, 4096, &bp)) != 0)
 		goto error_exit;
 	bp->b_flags |= B_AGE;
 	bsp = (union bootsector *)bp->b_data;
@@ -485,7 +485,7 @@ msdosfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
 	        struct fsinfo *fp;
 
 		if ((error = bread(devvp, pmp->pm_fsinfo, fsi_size(pmp),
-		    NOCRED, &bp)) != 0)
+		    &bp)) != 0)
 		        goto error_exit;
 		fp = (struct fsinfo *)bp->b_data;
 		if (!bcmp(fp->fsisig1, "RRaA", 4)
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 29a3d35060e..eed2707068e 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.77 2011/04/05 14:14:07 thib Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.78 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $	*/
 
 /*-
@@ -471,7 +471,7 @@ msdosfs_read(void *v)
 		 * vnode for the directory.
 		 */
 		if (isadir) {
-			error = bread(pmp->pm_devvp, lbn, blsize, NOCRED, &bp);
+			error = bread(pmp->pm_devvp, lbn, blsize, &bp);
 		} else {
 			rablock = lbn + 1;
 			rablkno = de_cn2bn(pmp, rablock);
@@ -479,10 +479,10 @@ msdosfs_read(void *v)
 			    de_cn2off(pmp, rablock) < dep->de_FileSize)
 				error = breadn(vp, de_cn2bn(pmp, lbn),
 				    pmp->pm_bpcluster, &rablkno,
-				    &pmp->pm_bpcluster, 1, NOCRED, &bp);
+				    &pmp->pm_bpcluster, 1, &bp);
 			else
 				error = bread(vp, de_cn2bn(pmp, lbn),
-				    pmp->pm_bpcluster, NOCRED, &bp);
+				    pmp->pm_bpcluster, &bp);
 			dep->de_lastr = lbn;
 		}
 		n = min(n, pmp->pm_bpcluster - bp->b_resid);
@@ -630,8 +630,7 @@ msdosfs_write(void *v)
 			/*
 			 * The block we need to write into exists, so read it in.
 			 */
-			error = bread(thisvp, bn, pmp->pm_bpcluster,
-				      NOCRED, &bp);
+			error = bread(thisvp, bn, pmp->pm_bpcluster, &bp);
 			if (error) {
 				brelse(bp);
 				break;
@@ -1101,8 +1100,7 @@ abortit:
 			panic("msdosfs_rename: updating .. in root directory?");
 		} else
 			bn = cntobn(pmp, cn);
-		error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster,
-			      NOCRED, &bp);
+		error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster, &bp);
 		if (error) {
 			/* XXX should really panic here, fs is corrupt */
 			brelse(bp);
@@ -1479,7 +1477,7 @@ msdosfs_readdir(void *v)
 		n = min(n, diff);
 		if ((error = pcbmap(dep, lbn, &bn, &cn, &blsize)) != 0)
 			break;
-		error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp);
+		error = bread(pmp->pm_devvp, bn, blsize, &bp);
 		if (error) {
 			brelse(bp);
 			return (error);
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index 557b18c2ede..06bfda769b1 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_subr.c,v 1.23 2010/09/09 11:31:40 miod Exp $	*/
+/*	$OpenBSD: ntfs_subr.c,v 1.24 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ntfs_subr.c,v 1.4 2003/04/10 21:37:32 jdolecek Exp $	*/
 
 /*-
@@ -292,9 +292,8 @@ ntfs_loadntnode(
 		bn = ntfs_cntobn(ntmp->ntm_mftcn) +
 			ntmp->ntm_bpmftrec * ip->i_number;
 
-		error = bread(ntmp->ntm_devvp,
-			      bn, ntfs_bntob(ntmp->ntm_bpmftrec),
-			      NOCRED, &bp);
+		error = bread(ntmp->ntm_devvp, bn,
+		    ntfs_bntob(ntmp->ntm_bpmftrec), &bp);
 		if (error) {
 			printf("ntfs_loadntnode: BREAD FAILED\n");
 			brelse(bp);
@@ -1509,7 +1508,7 @@ ntfs_writentvattr_plain(
 				clrbuf(bp);
 			} else {
 				error = bread(ntmp->ntm_devvp, ntfs_cntobn(cn),
-					      ntfs_cntob(cl), NOCRED, &bp);
+					      ntfs_cntob(cl), &bp);
 				if (error) {
 					brelse(bp);
 					return (error);
@@ -1618,7 +1617,7 @@ ntfs_readntvattr_plain(
 					error = bread(ntmp->ntm_devvp,
 						      ntfs_cntobn(cn),
 						      ntfs_cntob(cl),
-						      NOCRED, &bp);
+						      &bp);
 					if (error) {
 						brelse(bp);
 						return (error);
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 092a1d8825b..768908f4a17 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_vfsops.c,v 1.25 2011/04/03 17:17:41 jsing Exp $	*/
+/*	$OpenBSD: ntfs_vfsops.c,v 1.26 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $	*/
 
 /*-
@@ -359,7 +359,7 @@ ntfs_mountfs(devvp, mp, argsp, p)
 
 	bp = NULL;
 
-	error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp);
+	error = bread(devvp, BBLOCK, BBSIZE, &bp);
 	if (error)
 		goto out;
 	ntmp = malloc(sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO);
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 34c17ca101c..6ae826ad94e 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf.h,v 1.77 2011/06/05 19:41:08 deraadt Exp $	*/
+/*	$OpenBSD: buf.h,v 1.78 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: buf.h,v 1.25 1997/04/09 21:12:17 mycroft Exp $	*/
 
 /*
@@ -268,9 +268,9 @@ void	bawrite(struct buf *);
 void	bdwrite(struct buf *);
 void	biodone(struct buf *);
 int	biowait(struct buf *);
-int bread(struct vnode *, daddr64_t, int, struct ucred *, struct buf **);
+int bread(struct vnode *, daddr64_t, int, struct buf **);
 int breadn(struct vnode *, daddr64_t, int, daddr64_t *, int *, int,
-    struct ucred *, struct buf **);
+    struct buf **);
 void	brelse(struct buf *);
 void	bremfree(struct buf *);
 void	bufinit(void);
diff --git a/sys/ufs/ext2fs/ext2fs_alloc.c b/sys/ufs/ext2fs/ext2fs_alloc.c
index db218f6cfc1..68fe1da828c 100644
--- a/sys/ufs/ext2fs/ext2fs_alloc.c
+++ b/sys/ufs/ext2fs/ext2fs_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_alloc.c,v 1.25 2008/01/05 19:49:26 otto Exp $	*/
+/*	$OpenBSD: ext2fs_alloc.c,v 1.26 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ext2fs_alloc.c,v 1.10 2001/07/05 08:38:27 toshii Exp $	*/
 
 /*
@@ -324,7 +324,7 @@ ext2fs_alloccg(struct inode *ip, int cg, int32_t bpref, int size)
 		return (0);
 	error = bread(ip->i_devvp, fsbtodb(fs,
 		fs->e2fs_gd[cg].ext2bgd_b_bitmap),
-		(int)fs->e2fs_bsize, NOCRED, &bp);
+		(int)fs->e2fs_bsize, &bp);
 	if (error || fs->e2fs_gd[cg].ext2bgd_nbfree == 0) {
 		brelse(bp);
 		return (0);
@@ -409,7 +409,7 @@ ext2fs_nodealloccg(struct inode *ip, int cg, int32_t ipref, int mode)
 		return (0);
 	error = bread(ip->i_devvp, fsbtodb(fs,
 		fs->e2fs_gd[cg].ext2bgd_i_bitmap),
-		(int)fs->e2fs_bsize, NOCRED, &bp);
+		(int)fs->e2fs_bsize, &bp);
 	if (error) {
 		brelse(bp);
 		return (0);
@@ -480,7 +480,7 @@ ext2fs_blkfree(struct inode *ip, int32_t bno)
 	}
 	error = bread(ip->i_devvp,
 		fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap),
-		(int)fs->e2fs_bsize, NOCRED, &bp);
+		(int)fs->e2fs_bsize, &bp);
 	if (error) {
 		brelse(bp);
 		return;
@@ -520,7 +520,7 @@ ext2fs_inode_free(struct inode *pip, ino_t ino, mode_t mode)
 	cg = ino_to_cg(fs, ino);
 	error = bread(pip->i_devvp, 
 	        fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_i_bitmap),
-		(int)fs->e2fs_bsize, NOCRED, &bp);
+		(int)fs->e2fs_bsize, &bp);
 	if (error) {
 		brelse(bp);
 		return (0);
diff --git a/sys/ufs/ext2fs/ext2fs_balloc.c b/sys/ufs/ext2fs/ext2fs_balloc.c
index ff655ac2760..0d4d4d1ddaf 100644
--- a/sys/ufs/ext2fs/ext2fs_balloc.c
+++ b/sys/ufs/ext2fs/ext2fs_balloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_balloc.c,v 1.17 2009/09/05 17:23:43 jasper Exp $	*/
+/*	$OpenBSD: ext2fs_balloc.c,v 1.18 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ext2fs_balloc.c,v 1.10 2001/07/04 21:16:01 chs Exp $	*/
 
 /*
@@ -82,7 +82,7 @@ ext2fs_buf_alloc(struct inode *ip, daddr64_t bn, int size, struct ucred *cred,
 	if (bn < NDADDR) {
 		nb = fs2h32(ip->i_e2fs_blocks[bn]);
 		if (nb != 0) {
-			error = bread(vp, bn, fs->e2fs_bsize, NOCRED, &bp);
+			error = bread(vp, bn, fs->e2fs_bsize, &bp);
 			if (error) {
 				brelse(bp);
 				return (error);
@@ -153,8 +153,7 @@ ext2fs_buf_alloc(struct inode *ip, daddr64_t bn, int size, struct ucred *cred,
 	 * Fetch through the indirect blocks, allocating as necessary.
 	 */
 	for (i = 1;;) {
-		error = bread(vp,
-		    indirs[i].in_lbn, (int)fs->e2fs_bsize, NOCRED, &bp);
+		error = bread(vp, indirs[i].in_lbn, (int)fs->e2fs_bsize, &bp);
 		if (error) {
 			brelse(bp);
 			goto fail;
@@ -234,7 +233,7 @@ ext2fs_buf_alloc(struct inode *ip, daddr64_t bn, int size, struct ucred *cred,
 	}
 	brelse(bp);
 	if (flags & B_CLRBUF) {
-		error = bread(vp, lbn, (int)fs->e2fs_bsize, NOCRED, &nbp);
+		error = bread(vp, lbn, (int)fs->e2fs_bsize, &nbp);
 		if (error) {
 			brelse(nbp);
 			goto fail;
@@ -262,7 +261,7 @@ fail:
 			int r;
 	
 			r = bread(vp, indirs[unwindidx].in_lbn, 
-			    (int)fs->e2fs_bsize, NOCRED, &bp);
+			    (int)fs->e2fs_bsize, &bp);
 			if (r) {
 				panic("Could not unwind indirect block, error %d", r);
 			} else {
diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c
index 5a90e6eafcc..a1e467fc038 100644
--- a/sys/ufs/ext2fs/ext2fs_inode.c
+++ b/sys/ufs/ext2fs/ext2fs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_inode.c,v 1.43 2008/11/23 23:52:35 tedu Exp $	*/
+/*	$OpenBSD: ext2fs_inode.c,v 1.44 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $	*/
 
 /*
@@ -180,7 +180,7 @@ ext2fs_update(struct inode *ip, struct timespec *atime, struct timespec *mtime,
 	fs = ip->i_e2fs;
 	error = bread(ip->i_devvp,
 			  fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
-			  (int)fs->e2fs_bsize, NOCRED, &bp);
+			  (int)fs->e2fs_bsize, &bp);
 	if (error) {
 		brelse(bp);
 		return (error);
diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c
index add2dfbc4a5..a03470b37a3 100644
--- a/sys/ufs/ext2fs/ext2fs_readwrite.c
+++ b/sys/ufs/ext2fs/ext2fs_readwrite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_readwrite.c,v 1.22 2007/06/17 20:15:25 jasper Exp $	*/
+/*	$OpenBSD: ext2fs_readwrite.c,v 1.23 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ext2fs_readwrite.c,v 1.16 2001/02/27 04:37:47 chs Exp $	*/
 
 /*-
@@ -112,13 +112,13 @@ ext2fs_read(void *v)
 			xfersize = bytesinfile;
 
 		if (lblktosize(fs, nextlbn) >= ext2fs_size(ip))
-			error = bread(vp, lbn, size, NOCRED, &bp);
+			error = bread(vp, lbn, size, &bp);
 		else if (lbn - 1 == ip->i_ci.ci_lastr) {
 			int nextsize = fs->e2fs_bsize;
-			error = breadn(vp, lbn,
-				size, &nextlbn, &nextsize, 1, NOCRED, &bp);
+			error = breadn(vp, lbn, size, &nextlbn, &nextsize,
+			    1, &bp);
 		} else
-			error = bread(vp, lbn, size, NOCRED, &bp);
+			error = bread(vp, lbn, size, &bp);
 		if (error)
 			break;
 		ip->i_ci.ci_lastr = lbn;
diff --git a/sys/ufs/ext2fs/ext2fs_subr.c b/sys/ufs/ext2fs/ext2fs_subr.c
index 5df7f924e08..8878644ad64 100644
--- a/sys/ufs/ext2fs/ext2fs_subr.c
+++ b/sys/ufs/ext2fs/ext2fs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_subr.c,v 1.25 2011/07/03 18:23:10 tedu Exp $	*/
+/*	$OpenBSD: ext2fs_subr.c,v 1.26 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ext2fs_subr.c,v 1.1 1997/06/11 09:34:03 bouyer Exp $	*/
 
 /*
@@ -90,7 +90,7 @@ ext2fs_bufatoff(struct inode *ip, off_t offset, char **res, struct buf **bpp)
 	lbn = lblkno(fs, offset);
 
 	*bpp = NULL;
-	if ((error = bread(vp, lbn, fs->e2fs_bsize, NOCRED, &bp)) != 0) {
+	if ((error = bread(vp, lbn, fs->e2fs_bsize, &bp)) != 0) {
 		brelse(bp);
 		return (error);
 	}
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index 62c2d423da2..356976e3715 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_vfsops.c,v 1.62 2011/07/04 04:15:26 krw Exp $	*/
+/*	$OpenBSD: ext2fs_vfsops.c,v 1.63 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $	*/
 
 /*
@@ -359,7 +359,7 @@ ext2fs_reload_vnode(struct vnode *vp, void *args)
 	ip = VTOI(vp);
 	error = bread(era->devvp, 
 	    fsbtodb(era->fs, ino_to_fsba(era->fs, ip->i_number)),
-	    (int)era->fs->e2fs_bsize, NOCRED, &bp);
+	    (int)era->fs->e2fs_bsize, &bp);
 	if (error) {
 		vput(vp);
 		return (error);
@@ -407,7 +407,7 @@ ext2fs_reload(struct mount *mountp, struct ucred *cred, struct proc *p)
 	/*
 	 * Step 2: re-read superblock from disk.
 	 */
-	error = bread(devvp, (daddr64_t)(SBOFF / DEV_BSIZE), SBSIZE, NOCRED, &bp);
+	error = bread(devvp, (daddr64_t)(SBOFF / DEV_BSIZE), SBSIZE, &bp);
 	if (error) {
 		brelse(bp);
 		return (error);
@@ -445,7 +445,7 @@ ext2fs_reload(struct mount *mountp, struct ucred *cred, struct proc *p)
 	for (i=0; i < fs->e2fs_ngdb; i++) {
 		error = bread(devvp ,
 		    fsbtodb(fs, ((fs->e2fs_bsize>1024)? 0 : 1) + i + 1),
-		    fs->e2fs_bsize, NOCRED, &bp);
+		    fs->e2fs_bsize, &bp);
 		if (error) {
 			brelse(bp);
 			return (error);
@@ -506,7 +506,7 @@ ext2fs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
 #ifdef DEBUG_EXT2
 	printf("ext2 sb size: %d\n", sizeof(struct ext2fs));
 #endif
-	error = bread(devvp, (daddr64_t)(SBOFF / DEV_BSIZE), SBSIZE, cred, &bp);
+	error = bread(devvp, (daddr64_t)(SBOFF / DEV_BSIZE), SBSIZE, &bp);
 	if (error)
 		goto out;
 	fs = (struct ext2fs *)bp->b_data;
@@ -554,7 +554,7 @@ ext2fs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
 	for (i=0; i < m_fs->e2fs_ngdb; i++) {
 		error = bread(devvp ,
 		    fsbtodb(m_fs, ((m_fs->e2fs_bsize>1024)? 0 : 1) + i + 1),
-		    m_fs->e2fs_bsize, NOCRED, &bp);
+		    m_fs->e2fs_bsize, &bp);
 		if (error) {
 			free(m_fs->e2fs_gd, M_UFSMNT);
 			goto out;
@@ -852,7 +852,7 @@ ext2fs_vget(struct mount *mp, ino_t ino, struct vnode **vpp)
 
 	/* Read in the disk contents for the inode, copy into the inode. */
 	error = bread(ump->um_devvp, fsbtodb(fs, ino_to_fsba(fs, ino)),
-	    (int)fs->e2fs_bsize, NOCRED, &bp);
+	    (int)fs->e2fs_bsize, &bp);
 	if (error) {
 		/*
 		 * The inode does not contain anything useful, so it would
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 231f58d5c8d..623c9d551c2 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_alloc.c,v 1.90 2011/07/03 18:23:10 tedu Exp $	*/
+/*	$OpenBSD: ffs_alloc.c,v 1.91 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $	*/
 
 /*
@@ -222,8 +222,7 @@ ffs_realloccg(struct inode *ip, daddr64_t lbprev, daddr64_t bpref, int osize,
 	 * Allocate the extra space in the buffer.
 	 */
 	if (bpp != NULL) {
-		if ((error = bread(ITOV(ip), lbprev, fs->fs_bsize,
-		    NOCRED, &bp)) != 0)
+		if ((error = bread(ITOV(ip), lbprev, fs->fs_bsize, &bp)) != 0)
 			goto error;
 		bp->b_bcount = osize;
 	}
@@ -431,7 +430,7 @@ ffs1_reallocblks(void *v)
 		soff = start_lbn;
 	} else {
 		idp = &start_ap[start_lvl - 1];
-		if (bread(vp, idp->in_lbn, (int)fs->fs_bsize, NOCRED, &sbp)) {
+		if (bread(vp, idp->in_lbn, (int)fs->fs_bsize, &sbp)) {
 			brelse(sbp);
 			return (ENOSPC);
 		}
@@ -454,7 +453,7 @@ ffs1_reallocblks(void *v)
 			panic("ffs1_reallocblk: start == end");
 #endif
 		ssize = len - (idp->in_off + 1);
-		if (bread(vp, idp->in_lbn, (int)fs->fs_bsize, NOCRED, &ebp))
+		if (bread(vp, idp->in_lbn, (int)fs->fs_bsize, &ebp))
 			goto fail;
 		ebap = (int32_t *)ebp->b_data;
 	}
@@ -640,7 +639,7 @@ ffs2_reallocblks(void *v)
 		soff = start_lbn;
 	} else {
 		idp = &start_ap[start_lvl - 1];
-		if (bread(vp, idp->in_lbn, (int)fs->fs_bsize, NOCRED, &sbp)) {
+		if (bread(vp, idp->in_lbn, (int)fs->fs_bsize, &sbp)) {
 			brelse(sbp);
 			return (ENOSPC);
 		}
@@ -659,7 +658,7 @@ ffs2_reallocblks(void *v)
 			panic("ffs2_reallocblk: start == end");
 #endif
 		ssize = len - (idp->in_off + 1);
-		if (bread(vp, idp->in_lbn, (int)fs->fs_bsize, NOCRED, &ebp))
+		if (bread(vp, idp->in_lbn, (int)fs->fs_bsize, &ebp))
 			goto fail;
 		ebap = (daddr64_t *)ebp->b_data;
 	}
@@ -1190,7 +1189,7 @@ ffs_cgread(struct fs *fs, struct inode *ip, int cg)
 	struct buf *bp;
 
 	if (bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)),
-		(int)fs->fs_cgsize, NOCRED, &bp)) {
+	    (int)fs->fs_cgsize, &bp)) {
 		brelse(bp);
 		return (NULL);
 	}
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index df2407c7d0c..e22675fde65 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_balloc.c,v 1.36 2008/01/05 19:49:26 otto Exp $	*/
+/*	$OpenBSD: ffs_balloc.c,v 1.37 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ffs_balloc.c,v 1.3 1996/02/09 22:22:21 christos Exp $	*/
 
 /*
@@ -141,8 +141,7 @@ ffs1_balloc(struct inode *ip, off_t startoffset, int size, struct ucred *cred,
 			 */
 
 			if (bpp != NULL) {
-				error = bread(vp, lbn, fs->fs_bsize, NOCRED,
-				    bpp);
+				error = bread(vp, lbn, fs->fs_bsize, bpp);
 				if (error) {
 					brelse(*bpp);
 					return (error);
@@ -164,7 +163,7 @@ ffs1_balloc(struct inode *ip, off_t startoffset, int size, struct ucred *cred,
 				 */
 				if (bpp != NULL) {
 					error = bread(vp, lbn, fs->fs_bsize,
-					    NOCRED, bpp);
+					    bpp);
 					if (error) {
 						brelse(*bpp);
 						return (error);
@@ -272,8 +271,7 @@ ffs1_balloc(struct inode *ip, off_t startoffset, int size, struct ucred *cred,
 	 * Fetch through the indirect blocks, allocating as necessary.
 	 */
 	for (i = 1;;) {
-		error = bread(vp,
-		    indirs[i].in_lbn, (int)fs->fs_bsize, NOCRED, &bp);
+		error = bread(vp, indirs[i].in_lbn, (int)fs->fs_bsize, &bp);
 		if (error) {
 			brelse(bp);
 			goto fail;
@@ -366,7 +364,7 @@ ffs1_balloc(struct inode *ip, off_t startoffset, int size, struct ucred *cred,
 	brelse(bp);
 	if (bpp != NULL) {
 		if (flags & B_CLRBUF) {
-			error = bread(vp, lbn, (int)fs->fs_bsize, NOCRED, &nbp);
+			error = bread(vp, lbn, (int)fs->fs_bsize, &nbp);
 			if (error) {
 				brelse(nbp);
 				goto fail;
@@ -406,8 +404,7 @@ fail:
 	} else if (unwindidx >= 0) {
 		int r;
 
-		r = bread(vp, indirs[unwindidx].in_lbn, 
-		    (int)fs->fs_bsize, NOCRED, &bp);
+		r = bread(vp, indirs[unwindidx].in_lbn, (int)fs->fs_bsize, &bp);
 		if (r)
 			panic("Could not unwind indirect block, error %d", r);
 		bap = (int32_t *)bp->b_data;
@@ -512,8 +509,7 @@ ffs2_balloc(struct inode *ip, off_t off, int size, struct ucred *cred,
 			 * block. Just read it, if requested.
 			 */
 			if (bpp != NULL) {
-				error = bread(vp, lbn, fs->fs_bsize, NOCRED,
-				    bpp);
+				error = bread(vp, lbn, fs->fs_bsize, bpp);
 				if (error) {
 					brelse(*bpp);
 					return (error);
@@ -537,7 +533,7 @@ ffs2_balloc(struct inode *ip, off_t off, int size, struct ucred *cred,
 				 */
 				if (bpp != NULL) {
 					error = bread(vp, lbn, fs->fs_bsize,
-					    NOCRED, bpp);
+					    bpp);
 					if (error) {
 						brelse(*bpp);
 						return (error);
@@ -657,8 +653,7 @@ ffs2_balloc(struct inode *ip, off_t off, int size, struct ucred *cred,
 	 * Fetch through the indirect blocks, allocating as necessary.
 	 */
 	for (i = 1;;) {
-		error = bread(vp, indirs[i].in_lbn, (int) fs->fs_bsize,
-		    NOCRED, &bp);
+		error = bread(vp, indirs[i].in_lbn, (int)fs->fs_bsize, &bp);
 		if (error) {
 			brelse(bp);
 			goto fail;
@@ -773,7 +768,7 @@ ffs2_balloc(struct inode *ip, off_t off, int size, struct ucred *cred,
 
 	if (bpp != NULL) {
 		if (flags & B_CLRBUF) {
-			error = bread(vp, lbn, (int)fs->fs_bsize, NOCRED, &nbp);
+			error = bread(vp, lbn, (int)fs->fs_bsize, &nbp);
 			if (error) {
 				brelse(nbp);
 				goto fail;
@@ -854,7 +849,7 @@ fail:
 				ffs_update(ip, NULL, NULL, MNT_WAIT);
 		} else {
 			r = bread(vp, indirs[unwindidx].in_lbn,
-			    (int) fs->fs_bsize, NOCRED, &bp);
+			    (int)fs->fs_bsize, &bp);
 			if (r)
 				panic("ffs2_balloc: unwind failed");
 
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 57a691e6cf7..c6f8caa5a81 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_inode.c,v 1.57 2011/04/12 19:45:43 beck Exp $	*/
+/*	$OpenBSD: ffs_inode.c,v 1.58 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $	*/
 
 /*
@@ -117,7 +117,7 @@ ffs_update(struct inode *ip, struct timespec *atime,
 	}
 
 	error = bread(ip->i_devvp, fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
-		(int)fs->fs_bsize, NOCRED, &bp);
+	    (int)fs->fs_bsize, &bp);
 	if (error) {
 		brelse(bp);
 		return (error);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 75e0587d279..f7d8f87f61d 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_softdep.c,v 1.105 2011/07/03 18:23:10 tedu Exp $	*/
+/*	$OpenBSD: ffs_softdep.c,v 1.106 2011/07/04 04:30:41 tedu Exp $	*/
 
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -1221,7 +1221,7 @@ softdep_mount(struct vnode *devvp, struct mount *mp, struct fs *fs,
 	bzero(&cstotal, sizeof cstotal);
 	for (cyl = 0; cyl < fs->fs_ncg; cyl++) {
 		if ((error = bread(devvp, fsbtodb(fs, cgtod(fs, cyl)),
-		    fs->fs_cgsize, cred, &bp)) != 0) {
+		    fs->fs_cgsize, &bp)) != 0) {
 			brelse(bp);
 			return (error);
 		}
@@ -1920,7 +1920,7 @@ softdep_setup_freeblocks(struct inode *ip, off_t length)
 	 */
 	if ((error = bread(ip->i_devvp,
 	    fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
-	    (int)fs->fs_bsize, NOCRED, &bp)) != 0)
+	    (int)fs->fs_bsize, &bp)) != 0)
 		softdep_error("softdep_setup_freeblocks", error);
 
 	if (ip->i_ump->um_fstype == UM_UFS1)
@@ -2454,7 +2454,7 @@ indir_trunc(struct inode *ip, daddr64_t dbn, int level, daddr64_t lbn,
 		FREE_LOCK(&lk);
 	} else {
 		FREE_LOCK(&lk);
-		error = bread(ip->i_devvp, dbn, (int)fs->fs_bsize, NOCRED, &bp);
+		error = bread(ip->i_devvp, dbn, (int)fs->fs_bsize, &bp);
 		if (error)
 			return (error);
 	}
@@ -4587,7 +4587,7 @@ softdep_fsync(struct vnode *vp)
 		/*
 		 * Flush directory page containing the inode's name.
 		 */
-		error = bread(pvp, lbn, fs->fs_bsize, p->p_ucred, &bp);
+		error = bread(pvp, lbn, fs->fs_bsize, &bp);
 		if (error == 0) {
 			bp->b_bcount = blksize(fs, pip, lbn);
 			error = bwrite(bp);
@@ -5139,7 +5139,7 @@ flush_pagedep_deps(struct vnode *pvp, struct mount *mp,
 		FREE_LOCK(&lk);
 		if ((error = bread(ump->um_devvp,
 		    fsbtodb(ump->um_fs, ino_to_fsba(ump->um_fs, inum)),
-		    (int)ump->um_fs->fs_bsize, NOCRED, &bp)) != 0) {
+		    (int)ump->um_fs->fs_bsize, &bp)) != 0) {
 		    	brelse(bp);
 			break;
 		}
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 7270b7d97e8..02a69e1f987 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_subr.c,v 1.25 2011/07/03 18:23:10 tedu Exp $	*/
+/*	$OpenBSD: ffs_subr.c,v 1.26 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ffs_subr.c,v 1.6 1996/03/17 02:16:23 christos Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ ffs_bufatoff(struct inode *ip, off_t offset, char **res, struct buf **bpp)
 	bsize = blksize(fs, ip, lbn);
 
 	*bpp = NULL;
-	if ((error = bread(vp, lbn, fs->fs_bsize, NOCRED, &bp)) != 0) {
+	if ((error = bread(vp, lbn, fs->fs_bsize, &bp)) != 0) {
 		brelse(bp);
 		return (error);
 	}
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 4514f28eb76..77acce3834b 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_vfsops.c,v 1.131 2011/07/03 18:23:10 tedu Exp $	*/
+/*	$OpenBSD: ffs_vfsops.c,v 1.132 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $	*/
 
 /*
@@ -501,7 +501,7 @@ ffs_reload_vnode(struct vnode *vp, void *args)
 
 	error = bread(fra->devvp, 
 	    fsbtodb(fra->fs, ino_to_fsba(fra->fs, ip->i_number)),
-	    (int)fra->fs->fs_bsize, NOCRED, &bp);
+	    (int)fra->fs->fs_bsize, &bp);
 	if (error) {
 		brelse(bp);
 		vput(vp);
@@ -557,8 +557,7 @@ ffs_reload(struct mount *mountp, struct ucred *cred, struct proc *p)
 	 */
 	fs = VFSTOUFS(mountp)->um_fs;
 
-	error = bread(devvp, (daddr64_t)(fs->fs_sblockloc / DEV_BSIZE), SBSIZE,
-	    NOCRED, &bp);
+	error = bread(devvp, fs->fs_sblockloc / DEV_BSIZE, SBSIZE, &bp);
 	if (error) {
 		brelse(bp);
 		return (error);
@@ -595,8 +594,7 @@ ffs_reload(struct mount *mountp, struct ucred *cred, struct proc *p)
 		size = fs->fs_bsize;
 		if (i + fs->fs_frag > blks)
 			size = (blks - i) * fs->fs_fsize;
-		error = bread(devvp, fsbtodb(fs, fs->fs_csaddr + i), size,
-			      NOCRED, &bp);
+		error = bread(devvp, fsbtodb(fs, fs->fs_csaddr + i), size, &bp);
 		if (error) {
 			brelse(bp);
 			return (error);
@@ -714,7 +712,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
 			bp = NULL;
 		}
 
-		error = bread(devvp, sbtry[i] / DEV_BSIZE, SBSIZE, cred, &bp);
+		error = bread(devvp, sbtry[i] / DEV_BSIZE, SBSIZE, &bp);
 		if (error)
 			goto out;
 
@@ -817,8 +815,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
 		size = fs->fs_bsize;
 		if (i + fs->fs_frag > blks)
 			size = (blks - i) * fs->fs_fsize;
-		error = bread(devvp, fsbtodb(fs, fs->fs_csaddr + i), size,
-			      cred, &bp);
+		error = bread(devvp, fsbtodb(fs, fs->fs_csaddr + i), size, &bp);
 		if (error) {
 			free(fs->fs_csp, M_UFSMNT);
 			goto out;
@@ -1292,7 +1289,7 @@ retry:
 
 	/* Read in the disk contents for the inode, copy into the inode. */
 	error = bread(ump->um_devvp, fsbtodb(fs, ino_to_fsba(fs, ino)),
-		      (int)fs->fs_bsize, NOCRED, &bp);
+	    (int)fs->fs_bsize, &bp);
 	if (error) {
 		/*
 		 * The inode does not contain anything useful, so it would
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index a155b0b8363..1c7bda9692f 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_vnops.c,v 1.63 2011/06/09 23:31:32 deraadt Exp $	*/
+/*	$OpenBSD: ffs_vnops.c,v 1.64 2011/07/04 04:30:41 tedu Exp $	*/
 /*	$NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $	*/
 
 /*
@@ -245,11 +245,11 @@ ffs_read(void *v)
 			xfersize = bytesinfile;
 
 		if (lblktosize(fs, nextlbn) >= DIP(ip, size))
-			error = bread(vp, lbn, size, NOCRED, &bp);
+			error = bread(vp, lbn, size, &bp);
 		else if (lbn - 1 == ip->i_ci.ci_lastr) {
 			error = bread_cluster(vp, lbn, size, &bp);
 		} else
-			error = bread(vp, lbn, size, NOCRED, &bp);
+			error = bread(vp, lbn, size, &bp);
 
 		if (error)
 			break;