Module Name: src Committed By: maxv Date: Sat Mar 28 19:24:06 UTC 2015
Modified Files: src/share/man/man9: buffercache.9 src/sys/fs/adosfs: advfsops.c advnops.c src/sys/fs/cd9660: cd9660_lookup.c cd9660_rrip.c cd9660_vfsops.c cd9660_vnops.c src/sys/fs/efs: efs_subr.c src/sys/fs/filecorefs: filecore_bmap.c filecore_vfsops.c filecore_vnops.c src/sys/fs/hfs: hfs_subr.c src/sys/fs/msdosfs: msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c msdosfs_vfsops.c msdosfs_vnops.c src/sys/fs/nilfs: nilfs_subr.c nilfs_vfsops.c src/sys/fs/ntfs: ntfs_subr.c ntfs_vfsops.c src/sys/fs/sysvbfs: bfs_sysvbfs.c src/sys/fs/v7fs: v7fs_io_kern.c src/sys/kern: vfs_bio.c src/sys/miscfs/specfs: spec_vnops.c src/sys/sys: buf.h src/sys/ufs/chfs: chfs_vnops.c src/sys/ufs/ext2fs: ext2fs_alloc.c ext2fs_balloc.c ext2fs_inode.c ext2fs_readwrite.c ext2fs_subr.c ext2fs_vfsops.c src/sys/ufs/ffs: ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c ffs_vfsops.c ffs_wapbl.c src/sys/ufs/lfs: lfs.h lfs_balloc.c lfs_rfw.c lfs_segment.c lfs_syscalls.c lfs_vfsops.c ulfs_quota2.c ulfs_readwrite.c src/sys/ufs/ufs: ufs_quota2.c ufs_readwrite.c Log Message: Remove the 'cred' argument from bread(). Remove a now unused var in ffs_snapshot.c. Update the man page accordingly. ok hannken@ To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/share/man/man9/buffercache.9 cvs rdiff -u -r1.72 -r1.73 src/sys/fs/adosfs/advfsops.c cvs rdiff -u -r1.45 -r1.46 src/sys/fs/adosfs/advnops.c cvs rdiff -u -r1.29 -r1.30 src/sys/fs/cd9660/cd9660_lookup.c cvs rdiff -u -r1.17 -r1.18 src/sys/fs/cd9660/cd9660_rrip.c cvs rdiff -u -r1.89 -r1.90 src/sys/fs/cd9660/cd9660_vfsops.c cvs rdiff -u -r1.50 -r1.51 src/sys/fs/cd9660/cd9660_vnops.c cvs rdiff -u -r1.10 -r1.11 src/sys/fs/efs/efs_subr.c cvs rdiff -u -r1.10 -r1.11 src/sys/fs/filecorefs/filecore_bmap.c cvs rdiff -u -r1.77 -r1.78 src/sys/fs/filecorefs/filecore_vfsops.c cvs rdiff -u -r1.42 -r1.43 src/sys/fs/filecorefs/filecore_vnops.c cvs rdiff -u -r1.17 -r1.18 src/sys/fs/hfs/hfs_subr.c cvs rdiff -u -r1.50 -r1.51 src/sys/fs/msdosfs/msdosfs_denode.c cvs rdiff -u -r1.28 -r1.29 src/sys/fs/msdosfs/msdosfs_fat.c cvs rdiff -u -r1.33 -r1.34 src/sys/fs/msdosfs/msdosfs_lookup.c cvs rdiff -u -r1.117 -r1.118 src/sys/fs/msdosfs/msdosfs_vfsops.c cvs rdiff -u -r1.91 -r1.92 src/sys/fs/msdosfs/msdosfs_vnops.c cvs rdiff -u -r1.12 -r1.13 src/sys/fs/nilfs/nilfs_subr.c cvs rdiff -u -r1.20 -r1.21 src/sys/fs/nilfs/nilfs_vfsops.c cvs rdiff -u -r1.60 -r1.61 src/sys/fs/ntfs/ntfs_subr.c cvs rdiff -u -r1.103 -r1.104 src/sys/fs/ntfs/ntfs_vfsops.c cvs rdiff -u -r1.10 -r1.11 src/sys/fs/sysvbfs/bfs_sysvbfs.c cvs rdiff -u -r1.2 -r1.3 src/sys/fs/v7fs/v7fs_io_kern.c cvs rdiff -u -r1.254 -r1.255 src/sys/kern/vfs_bio.c cvs rdiff -u -r1.145 -r1.146 src/sys/miscfs/specfs/spec_vnops.c cvs rdiff -u -r1.120 -r1.121 src/sys/sys/buf.h cvs rdiff -u -r1.26 -r1.27 src/sys/ufs/chfs/chfs_vnops.c cvs rdiff -u -r1.45 -r1.46 src/sys/ufs/ext2fs/ext2fs_alloc.c cvs rdiff -u -r1.39 -r1.40 src/sys/ufs/ext2fs/ext2fs_balloc.c cvs rdiff -u -r1.81 -r1.82 src/sys/ufs/ext2fs/ext2fs_inode.c cvs rdiff -u -r1.73 -r1.74 src/sys/ufs/ext2fs/ext2fs_readwrite.c cvs rdiff -u -r1.30 -r1.31 src/sys/ufs/ext2fs/ext2fs_subr.c cvs rdiff -u -r1.192 -r1.193 src/sys/ufs/ext2fs/ext2fs_vfsops.c cvs rdiff -u -r1.148 -r1.149 src/sys/ufs/ffs/ffs_alloc.c cvs rdiff -u -r1.60 -r1.61 src/sys/ufs/ffs/ffs_balloc.c cvs rdiff -u -r1.116 -r1.117 src/sys/ufs/ffs/ffs_inode.c cvs rdiff -u -r1.138 -r1.139 src/sys/ufs/ffs/ffs_snapshot.c cvs rdiff -u -r1.326 -r1.327 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.29 -r1.30 src/sys/ufs/ffs/ffs_wapbl.c cvs rdiff -u -r1.160 -r1.161 src/sys/ufs/lfs/lfs.h cvs rdiff -u -r1.80 -r1.81 src/sys/ufs/lfs/lfs_balloc.c cvs rdiff -u -r1.18 -r1.19 src/sys/ufs/lfs/lfs_rfw.c cvs rdiff -u -r1.236 -r1.237 src/sys/ufs/lfs/lfs_segment.c cvs rdiff -u -r1.155 -r1.156 src/sys/ufs/lfs/lfs_syscalls.c cvs rdiff -u -r1.321 -r1.322 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.17 -r1.18 src/sys/ufs/lfs/ulfs_quota2.c cvs rdiff -u -r1.14 -r1.15 src/sys/ufs/lfs/ulfs_readwrite.c cvs rdiff -u -r1.39 -r1.40 src/sys/ufs/ufs/ufs_quota2.c cvs rdiff -u -r1.114 -r1.115 src/sys/ufs/ufs/ufs_readwrite.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/man/man9/buffercache.9 diff -u src/share/man/man9/buffercache.9:1.26 src/share/man/man9/buffercache.9:1.27 --- src/share/man/man9/buffercache.9:1.26 Sat Mar 28 17:23:42 2015 +++ src/share/man/man9/buffercache.9 Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: buffercache.9,v 1.26 2015/03/28 17:23:42 maxv Exp $ +.\" $NetBSD: buffercache.9,v 1.27 2015/03/28 19:24:04 maxv Exp $ .\" .\" Copyright (c)2003 YAMAMOTO Takashi, .\" All rights reserved. @@ -124,7 +124,7 @@ .In sys/buf.h .Ft int .Fn bread "struct vnode *vp" "daddr_t blkno" "int size" \ -"struct kauth_cred *cred" "int flags" "buf_t **bpp" +"int flags" "buf_t **bpp" .Ft int .Fn breadn "struct vnode *vp" "daddr_t blkno" "int size" \ "daddr_t rablks[]" "int rasizes[]" "int nrablks" \ @@ -169,7 +169,7 @@ the disk driver interface. .\" ------------------------------------------------------------ .Sh FUNCTIONS .Bl -tag -width compact -.It Fn bread "vp" "blkno" "size" "cred" "flags" "bpp" +.It Fn bread "vp" "blkno" "size" "flags" "bpp" Read a block corresponding to .Fa vp and @@ -201,9 +201,7 @@ If the buffer is not found (i.e. the blo .Fn bread allocates a buffer with enough pages for .Fa size -and reads the specified disk block into it using -credential -.Fa cred . +and reads the specified disk block into it. .Pp The buffer returned by .Fn bread Index: src/sys/fs/adosfs/advfsops.c diff -u src/sys/fs/adosfs/advfsops.c:1.72 src/sys/fs/adosfs/advfsops.c:1.73 --- src/sys/fs/adosfs/advfsops.c:1.72 Fri Jan 2 19:42:07 2015 +++ src/sys/fs/adosfs/advfsops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: advfsops.c,v 1.72 2015/01/02 19:42:07 christos Exp $ */ +/* $NetBSD: advfsops.c,v 1.73 2015/03/28 19:24:05 maxv Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.72 2015/01/02 19:42:07 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.73 2015/03/28 19:24:05 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -232,7 +232,7 @@ adosfs_mountfs(struct vnode *devvp, stru /* The filesytem variant ('dostype') is stored in the boot block */ bp = NULL; if ((error = bread(devvp, (daddr_t)BBOFF, - amp->bsize, NOCRED, 0, &bp)) != 0) { + amp->bsize, 0, &bp)) != 0) { goto fail; } amp->dostype = adoswordn(bp, 0); @@ -403,7 +403,7 @@ adosfs_loadvnode(struct mount *mp, struc amp = VFSTOADOSFS(mp); if ((error = bread(amp->devvp, an * amp->bsize / DEV_BSIZE, - amp->bsize, NOCRED, 0, &bp)) != 0) + amp->bsize, 0, &bp)) != 0) return error; ap = pool_get(&adosfs_node_pool, PR_WAITOK); @@ -525,7 +525,7 @@ adosfs_loadvnode(struct mount *mp, struc brelse(bp, 0); bp = NULL; error = bread(amp->devvp, ap->linkto * amp->bsize / DEV_BSIZE, - amp->bsize, NOCRED, 0, &bp); + amp->bsize, 0, &bp); if (error) goto bad; ap->fsize = adoswordn(bp, ap->nwords - 47); @@ -609,7 +609,7 @@ adosfs_loadbitmap(struct adosfsmount *am bp = mapbp = NULL; bn = amp->rootb; if ((error = bread(amp->devvp, bn * amp->bsize / DEV_BSIZE, amp->bsize, - NOCRED, 0, &bp)) != 0) { + 0, &bp)) != 0) { return (error); } blkix = amp->nwords - 49; @@ -626,7 +626,7 @@ adosfs_loadbitmap(struct adosfsmount *am brelse(mapbp, 0); if ((error = bread(amp->devvp, adoswordn(bp, blkix) * amp->bsize / DEV_BSIZE, amp->bsize, - NOCRED, 0, &mapbp)) != 0) + 0, &mapbp)) != 0) break; if (adoscksum(mapbp, amp->nwords)) { #ifdef DIAGNOSTIC @@ -653,7 +653,7 @@ adosfs_loadbitmap(struct adosfsmount *am bn = adoswordn(bp, blkix); brelse(bp, 0); if ((error = bread(amp->devvp, bn * amp->bsize / DEV_BSIZE, - amp->bsize, NOCRED, 0, &bp)) != 0) + amp->bsize, 0, &bp)) != 0) break; /* * Why is there no checksum on these blocks? Index: src/sys/fs/adosfs/advnops.c diff -u src/sys/fs/adosfs/advnops.c:1.45 src/sys/fs/adosfs/advnops.c:1.46 --- src/sys/fs/adosfs/advnops.c:1.45 Tue Aug 5 08:50:54 2014 +++ src/sys/fs/adosfs/advnops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: advnops.c,v 1.45 2014/08/05 08:50:54 hannken Exp $ */ +/* $NetBSD: advnops.c,v 1.46 2015/03/28 19:24:05 maxv Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.45 2014/08/05 08:50:54 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.46 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -296,7 +296,7 @@ adosfs_read(void *v) * but not much as ados makes little attempt to * make things contigous */ - error = bread(sp->a_vp, lbn, amp->bsize, NOCRED, 0, &bp); + error = bread(sp->a_vp, lbn, amp->bsize, 0, &bp); if (error) { goto reterr; } @@ -516,7 +516,7 @@ adosfs_bmap(void *v) goto reterr; } error = bread(ap->amp->devvp, nb * ap->amp->bsize / DEV_BSIZE, - ap->amp->bsize, NOCRED, 0, &flbp); + ap->amp->bsize, 0, &flbp); if (error) { goto reterr; } Index: src/sys/fs/cd9660/cd9660_lookup.c diff -u src/sys/fs/cd9660/cd9660_lookup.c:1.29 src/sys/fs/cd9660/cd9660_lookup.c:1.30 --- src/sys/fs/cd9660/cd9660_lookup.c:1.29 Mon Jun 16 09:55:49 2014 +++ src/sys/fs/cd9660/cd9660_lookup.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_lookup.c,v 1.29 2014/06/16 09:55:49 hannken Exp $ */ +/* $NetBSD: cd9660_lookup.c,v 1.30 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1989, 1993, 1994 @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.29 2014/06/16 09:55:49 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.30 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/namei.h> @@ -394,7 +394,7 @@ cd9660_blkatoff(struct vnode *vp, off_t *bpp = NULL; return error; } - if ((error = bread(devvp, lbn, bsize, NOCRED, 0, &bp)) != 0) { + if ((error = bread(devvp, lbn, bsize, 0, &bp)) != 0) { *bpp = NULL; return (error); } Index: src/sys/fs/cd9660/cd9660_rrip.c diff -u src/sys/fs/cd9660/cd9660_rrip.c:1.17 src/sys/fs/cd9660/cd9660_rrip.c:1.18 --- src/sys/fs/cd9660/cd9660_rrip.c:1.17 Tue Sep 27 01:27:44 2011 +++ src/sys/fs/cd9660/cd9660_rrip.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_rrip.c,v 1.17 2011/09/27 01:27:44 christos Exp $ */ +/* $NetBSD: cd9660_rrip.c,v 1.18 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.17 2011/09/27 01:27:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.18 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -548,7 +548,7 @@ cd9660_rrip_loop(struct iso_directory_re || ana->iso_ce_off + ana->iso_ce_len > 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, + ana->imp->logical_block_size, 0, &bp)) /* what to do now? */ break; Index: src/sys/fs/cd9660/cd9660_vfsops.c diff -u src/sys/fs/cd9660/cd9660_vfsops.c:1.89 src/sys/fs/cd9660/cd9660_vfsops.c:1.90 --- src/sys/fs/cd9660/cd9660_vfsops.c:1.89 Wed Jul 9 08:43:54 2014 +++ src/sys/fs/cd9660/cd9660_vfsops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_vfsops.c,v 1.89 2014/07/09 08:43:54 maxv Exp $ */ +/* $NetBSD: cd9660_vfsops.c,v 1.90 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1994 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.89 2014/07/09 08:43:54 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.90 2015/03/28 19:24:05 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -381,7 +381,7 @@ iso_mountfs(struct vnode *devvp, struct for (iso_blknum = 16; iso_blknum < 100; iso_blknum++) { if ((error = bread(devvp, (iso_blknum+sess) * btodb(iso_bsize), - iso_bsize, NOCRED, 0, &bp)) != 0) + iso_bsize, 0, &bp)) != 0) goto out; vdp = (struct iso_volume_descriptor *)bp->b_data; @@ -458,7 +458,7 @@ iso_mountfs(struct vnode *devvp, struct if ((error = bread(isomp->im_devvp, (isomp->root_extent + ext_attr_length) << (isomp->im_bshift - DEV_BSHIFT), - isomp->logical_block_size, NOCRED, + isomp->logical_block_size, 0, &bp)) != 0) goto out; @@ -734,7 +734,7 @@ cd9660_loadvnode(struct mount *mp, struc error = bread(imp->im_devvp, lbn << (imp->im_bshift - DEV_BSHIFT), - imp->logical_block_size, NOCRED, 0, &bp); + imp->logical_block_size, 0, &bp); if (error) { pool_put(&cd9660_node_pool, ip); printf("fhtovp: bread error %d\n",error); Index: src/sys/fs/cd9660/cd9660_vnops.c diff -u src/sys/fs/cd9660/cd9660_vnops.c:1.50 src/sys/fs/cd9660/cd9660_vnops.c:1.51 --- src/sys/fs/cd9660/cd9660_vnops.c:1.50 Sat Mar 28 17:23:42 2015 +++ src/sys/fs/cd9660/cd9660_vnops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_vnops.c,v 1.50 2015/03/28 17:23:42 maxv Exp $ */ +/* $NetBSD: cd9660_vnops.c,v 1.51 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1994 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.50 2015/03/28 17:23:42 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.51 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -264,7 +264,7 @@ cd9660_read(void *v) error = breadn(vp, lbn, size, &rablock, &rasize, 1, 0, &bp); } else { - error = bread(vp, lbn, size, NOCRED, 0, &bp); + error = bread(vp, lbn, size, 0, &bp); } if (error) { return (error); @@ -600,7 +600,7 @@ cd9660_readlink(void *v) error = bread(imp->im_devvp, (ip->i_number >> imp->im_bshift) << (imp->im_bshift - DEV_BSHIFT), - imp->logical_block_size, NOCRED, 0, &bp); + imp->logical_block_size, 0, &bp); if (error) { return (EINVAL); } Index: src/sys/fs/efs/efs_subr.c diff -u src/sys/fs/efs/efs_subr.c:1.10 src/sys/fs/efs/efs_subr.c:1.11 --- src/sys/fs/efs/efs_subr.c:1.10 Wed Oct 30 08:27:01 2013 +++ src/sys/fs/efs/efs_subr.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: efs_subr.c,v 1.10 2013/10/30 08:27:01 mrg Exp $ */ +/* $NetBSD: efs_subr.c,v 1.11 2015/03/28 19:24:05 maxv Exp $ */ /* * Copyright (c) 2006 Stephen M. Rumble <rum...@ephemeral.org> @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: efs_subr.c,v 1.10 2013/10/30 08:27:01 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: efs_subr.c,v 1.11 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/kauth.h> @@ -188,7 +188,7 @@ efs_bread(struct efs_mount *emp, uint32_ KASSERT(bboff < EFS_SIZE_MAX); return (bread(emp->em_devvp, (daddr_t)bboff * (EFS_BB_SIZE / DEV_BSIZE), - EFS_BB_SIZE, (l == NULL) ? NOCRED : l->l_cred, 0, bp)); + EFS_BB_SIZE, 0, bp)); } /* Index: src/sys/fs/filecorefs/filecore_bmap.c diff -u src/sys/fs/filecorefs/filecore_bmap.c:1.10 src/sys/fs/filecorefs/filecore_bmap.c:1.11 --- src/sys/fs/filecorefs/filecore_bmap.c:1.10 Thu Dec 20 08:03:42 2012 +++ src/sys/fs/filecorefs/filecore_bmap.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: filecore_bmap.c,v 1.10 2012/12/20 08:03:42 hannken Exp $ */ +/* $NetBSD: filecore_bmap.c,v 1.11 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1994 The Regents of the University of California. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: filecore_bmap.c,v 1.10 2012/12/20 08:03:42 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: filecore_bmap.c,v 1.11 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -162,7 +162,7 @@ filecore_map(struct filecore_mnt *fcmp, sect <<= fcmp->drec.share_size; do { error=bread(fcmp->fc_devvp, fcmp->map + zone, - 1 << fcmp->drec.log2secsize, NOCRED, 0, &bp); + 1 << fcmp->drec.log2secsize, 0, &bp); #ifdef FILECORE_DEBUG_BR printf("bread(%p, %lx, %d, CRED, %p)=%d\n", fcmp->fc_devvp, fcmp->map+zone, 1 << fcmp->drec.log2secsize, bp, error); @@ -242,7 +242,7 @@ filecore_bread(struct filecore_mnt *fcmp #endif return error; } - error = bread(fcmp->fc_devvp, bn, size, cred, 0, bp); + error = bread(fcmp->fc_devvp, bn, size, 0, bp); #ifdef FILECORE_DEBUG_BR printf("bread(%p, %llx, %d, CRED, %p)=%d\n", fcmp->fc_devvp, (long long)bn, size, *bp, error); @@ -261,7 +261,7 @@ filecore_dbread(struct filecore_node *ip if (error) return error; error = bread(ip->i_mnt->fc_devvp, ip->i_block, FILECORE_DIR_SIZE, - NOCRED, 0, bp); + 0, bp); #ifdef FILECORE_DEBUG_BR printf("bread(%p, %llx, %d, CRED, %p)=%d\n", ip->i_mnt->fc_devvp, (long long)ip->i_block, FILECORE_DIR_SIZE, *bp, error); Index: src/sys/fs/filecorefs/filecore_vfsops.c diff -u src/sys/fs/filecorefs/filecore_vfsops.c:1.77 src/sys/fs/filecorefs/filecore_vfsops.c:1.78 --- src/sys/fs/filecorefs/filecore_vfsops.c:1.77 Sat Oct 4 13:27:24 2014 +++ src/sys/fs/filecorefs/filecore_vfsops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: filecore_vfsops.c,v 1.77 2014/10/04 13:27:24 hannken Exp $ */ +/* $NetBSD: filecore_vfsops.c,v 1.78 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1994 The Regents of the University of California. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.77 2014/10/04 13:27:24 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.78 2015/03/28 19:24:05 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -325,7 +325,7 @@ filecore_mountfs(struct vnode *devvp, st /* Read the filecore boot block to check FS validity and to find the map */ error = bread(devvp, FILECORE_BOOTBLOCK_BLKN, - FILECORE_BOOTBLOCK_SIZE, NOCRED, 0, &bp); + FILECORE_BOOTBLOCK_SIZE, 0, &bp); #ifdef FILECORE_DEBUG_BR printf("bread(%p, %x, %d, CRED, %p)=%d\n", devvp, FILECORE_BOOTBLOCK_BLKN, FILECORE_BOOTBLOCK_SIZE, @@ -352,7 +352,7 @@ filecore_mountfs(struct vnode *devvp, st bp = NULL; /* Read the bootblock in the map */ - error = bread(devvp, map, 1 << log2secsize, NOCRED, 0, &bp); + error = bread(devvp, map, 1 << log2secsize, 0, &bp); #ifdef FILECORE_DEBUG_BR printf("bread(%p, %x, %d, CRED, %p)=%d\n", devvp, map, 1 << log2secsize, bp, error); Index: src/sys/fs/filecorefs/filecore_vnops.c diff -u src/sys/fs/filecorefs/filecore_vnops.c:1.42 src/sys/fs/filecorefs/filecore_vnops.c:1.43 --- src/sys/fs/filecorefs/filecore_vnops.c:1.42 Fri Jul 25 08:20:51 2014 +++ src/sys/fs/filecorefs/filecore_vnops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: filecore_vnops.c,v 1.42 2014/07/25 08:20:51 dholland Exp $ */ +/* $NetBSD: filecore_vnops.c,v 1.43 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1994 The Regents of the University of California. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.42 2014/07/25 08:20:51 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.43 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -254,7 +254,7 @@ filecore_read(void *v) n = MIN(FILECORE_DIR_SIZE - on, uio->uio_resid); size = FILECORE_DIR_SIZE; } else { - error = bread(vp, lbn, size, NOCRED, 0, &bp); + error = bread(vp, lbn, size, 0, &bp); #ifdef FILECORE_DEBUG_BR printf("bread(%p, %llx, %ld, CRED, %p)=%d\n", vp, (long long)lbn, size, bp, error); Index: src/sys/fs/hfs/hfs_subr.c diff -u src/sys/fs/hfs/hfs_subr.c:1.17 src/sys/fs/hfs/hfs_subr.c:1.18 --- src/sys/fs/hfs/hfs_subr.c:1.17 Mon Nov 14 18:35:13 2011 +++ src/sys/fs/hfs/hfs_subr.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: hfs_subr.c,v 1.17 2011/11/14 18:35:13 hannken Exp $ */ +/* $NetBSD: hfs_subr.c,v 1.18 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hfs_subr.c,v 1.17 2011/11/14 18:35:13 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hfs_subr.c,v 1.18 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -319,7 +319,7 @@ hfs_pread(struct vnode *vp, void *buf, s error = bread(vp, (start + curoff) / DEV_BSIZE,/* no rounding involved*/ RBSZ(min(len - curoff + (off - start), MAXBSIZE), secsz), - cred, 0, &bp); + 0, &bp); if (error == 0) memcpy((uint8_t*)buf + curoff, (uint8_t*)bp->b_data + Index: src/sys/fs/msdosfs/msdosfs_denode.c diff -u src/sys/fs/msdosfs/msdosfs_denode.c:1.50 src/sys/fs/msdosfs/msdosfs_denode.c:1.51 --- src/sys/fs/msdosfs/msdosfs_denode.c:1.50 Tue Jul 8 09:21:52 2014 +++ src/sys/fs/msdosfs/msdosfs_denode.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_denode.c,v 1.50 2014/07/08 09:21:52 hannken Exp $ */ +/* $NetBSD: msdosfs_denode.c,v 1.51 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.50 2014/07/08 09:21:52 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.51 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -411,7 +411,7 @@ detrunc(struct denode *dep, u_long lengt if (isadir) { bn = cntobn(pmp, eofentry); error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), - pmp->pm_bpcluster, NOCRED, B_MODIFY, &bp); + pmp->pm_bpcluster, B_MODIFY, &bp); if (error) { #ifdef MSDOSFS_DEBUG printf("detrunc(): bread fails %d\n", error); Index: src/sys/fs/msdosfs/msdosfs_fat.c diff -u src/sys/fs/msdosfs/msdosfs_fat.c:1.28 src/sys/fs/msdosfs/msdosfs_fat.c:1.29 --- src/sys/fs/msdosfs/msdosfs_fat.c:1.28 Mon Jan 28 00:17:18 2013 +++ src/sys/fs/msdosfs/msdosfs_fat.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_fat.c,v 1.28 2013/01/28 00:17:18 christos Exp $ */ +/* $NetBSD: msdosfs_fat.c,v 1.29 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -52,7 +52,7 @@ #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.28 2013/01/28 00:17:18 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.29 2015/03/28 19:24:05 maxv Exp $"); /* * kernel include files. @@ -279,7 +279,7 @@ pcbmap(struct denode *dep, u_long findcn if (bp) brelse(bp, 0); error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), bsize, - NOCRED, 0, &bp); + 0, &bp); if (error) { DPRINTF(("%s(bread, %d)\n", __func__, error)); return (error); @@ -414,7 +414,7 @@ updatefats(struct msdosfsmount *pmp, str * padded at the end or in the middle? */ if (bread(pmp->pm_devvp, de_bn2kb(pmp, pmp->pm_fsinfo), - pmp->pm_BytesPerSec, NOCRED, B_MODIFY, &bpn) != 0) { + pmp->pm_BytesPerSec, B_MODIFY, &bpn) != 0) { /* * Ignore the error, but turn off FSInfo update for the future. */ @@ -583,7 +583,7 @@ fatentry(int function, struct msdosfsmou byteoffset = FATOFS(pmp, cn); fatblock(pmp, byteoffset, &bn, &bsize, &bo); - if ((error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), bsize, NOCRED, + if ((error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), bsize, 0, &bp)) != 0) { return (error); } @@ -660,7 +660,7 @@ fatchain(struct msdosfsmount *pmp, u_lon while (count > 0) { byteoffset = FATOFS(pmp, start); fatblock(pmp, byteoffset, &bn, &bsize, &bo); - error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), bsize, NOCRED, + error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), bsize, B_MODIFY, &bp); if (error) { return (error); @@ -883,7 +883,7 @@ freeclusterchain(struct msdosfsmount *pm if (bp) updatefats(pmp, bp, lbn); error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), bsize, - NOCRED, B_MODIFY, &bp); + B_MODIFY, &bp); if (error) { return (error); } @@ -956,7 +956,7 @@ fillinusemap(struct msdosfsmount *pmp) brelse(bp, 0); fatblock(pmp, byteoffset, &bn, &bsize, NULL); error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), bsize, - NOCRED, 0, &bp); + 0, &bp); if (error) { return (error); } Index: src/sys/fs/msdosfs/msdosfs_lookup.c diff -u src/sys/fs/msdosfs/msdosfs_lookup.c:1.33 src/sys/fs/msdosfs/msdosfs_lookup.c:1.34 --- src/sys/fs/msdosfs/msdosfs_lookup.c:1.33 Tue Jul 8 09:21:52 2014 +++ src/sys/fs/msdosfs/msdosfs_lookup.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_lookup.c,v 1.33 2014/07/08 09:21:52 hannken Exp $ */ +/* $NetBSD: msdosfs_lookup.c,v 1.34 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -52,7 +52,7 @@ #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.33 2014/07/08 09:21:52 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.34 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> @@ -231,7 +231,7 @@ msdosfs_lookup(void *v) break; return (error); } - error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, NOCRED, + error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, 0, &bp); if (error) { return (error); @@ -603,7 +603,7 @@ createde(struct denode *dep, struct deno clusoffset = ddep->de_fndoffset; if (dirclust != MSDOSFSROOT) clusoffset &= pmp->pm_crbomask; - if ((error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, NOCRED, + if ((error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, B_MODIFY, &bp)) != 0) { goto err_norollback; } @@ -641,7 +641,7 @@ createde(struct denode *dep, struct deno goto rollback; error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), - blsize, NOCRED, B_MODIFY, &bp); + blsize, B_MODIFY, &bp); if (error) { goto rollback; } @@ -704,7 +704,7 @@ createde(struct denode *dep, struct deno &bn, NULL, &blsize); if (rberror) goto err_norollback; - if ((rberror = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, NOCRED, + if ((rberror = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, B_MODIFY, &bp)) != 0) { goto err_norollback; } @@ -732,7 +732,7 @@ createde(struct denode *dep, struct deno goto err_norollback; rberror = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), - blsize, NOCRED, B_MODIFY, &bp); + blsize, B_MODIFY, &bp); if (rberror) { goto err_norollback; } @@ -779,7 +779,7 @@ dosdirempty(struct denode *dep) return (1); /* it's empty */ return (0); } - error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, NOCRED, + error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, 0, &bp); if (error) { return (0); @@ -871,7 +871,7 @@ doscheckpath(struct denode *source, stru } scn = dep->de_StartCluster; error = bread(pmp->pm_devvp, de_bn2kb(pmp, cntobn(pmp, scn)), - pmp->pm_bpcluster, NOCRED, 0, &bp); + pmp->pm_bpcluster, 0, &bp); if (error) break; @@ -948,7 +948,7 @@ readep(struct msdosfsmount *pmp, u_long && 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, de_bn2kb(pmp, bn), blsize, NOCRED, + if ((error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, 0, bpp)) != 0) { *bpp = NULL; return (error); @@ -1021,7 +1021,7 @@ removede(struct denode *pdep, struct den error = pcbmap(pdep, de_cluster(pmp, offset), &bn, 0, &blsize); if (error) return error; - error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, NOCRED, + error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, B_MODIFY, &bp); if (error) { return error; @@ -1095,7 +1095,7 @@ uniqdosname(struct denode *dep, struct c return error; } error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, - NOCRED, 0, &bp); + 0, &bp); if (error) { return error; } @@ -1145,7 +1145,7 @@ findwin95(struct denode *dep) for (cn = 0;; cn++) { if (pcbmap(dep, cn, &bn, 0, &blsize)) return win95; - if (bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, NOCRED, + if (bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, 0, &bp)) { return win95; } Index: src/sys/fs/msdosfs/msdosfs_vfsops.c diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.117 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.118 --- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.117 Fri Jan 23 03:33:58 2015 +++ src/sys/fs/msdosfs/msdosfs_vfsops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_vfsops.c,v 1.117 2015/01/23 03:33:58 christos Exp $ */ +/* $NetBSD: msdosfs_vfsops.c,v 1.118 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.117 2015/01/23 03:33:58 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.118 2015/03/28 19:24:05 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -515,7 +515,7 @@ msdosfs_mountfs(struct vnode *devvp, str error = EINVAL; goto error_exit; } - if ((error = bread(devvp, 0, secsize, NOCRED, 0, &bp)) != 0) + if ((error = bread(devvp, 0, secsize, 0, &bp)) != 0) goto error_exit; bsp = (union bootsector *)bp->b_data; b33 = (struct byte_bpb33 *)bsp->bs33.bsBPB; @@ -773,7 +773,7 @@ msdosfs_mountfs(struct vnode *devvp, str * padded at the end or in the middle? */ if ((error = bread(devvp, de_bn2kb(pmp, pmp->pm_fsinfo), - rdsz, NOCRED, 0, &bp)) != 0) + rdsz, 0, &bp)) != 0) goto error_exit; fp = (struct fsinfo *)bp->b_data; if (!memcmp(fp->fsisig1, "RRaA", 4) Index: src/sys/fs/msdosfs/msdosfs_vnops.c diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.91 src/sys/fs/msdosfs/msdosfs_vnops.c:1.92 --- src/sys/fs/msdosfs/msdosfs_vnops.c:1.91 Fri Jul 25 08:20:51 2014 +++ src/sys/fs/msdosfs/msdosfs_vnops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_vnops.c,v 1.91 2014/07/25 08:20:51 dholland Exp $ */ +/* $NetBSD: msdosfs_vnops.c,v 1.92 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.91 2014/07/25 08:20:51 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.92 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -522,7 +522,7 @@ msdosfs_read(void *v) * vnode for the directory. */ error = bread(pmp->pm_devvp, de_bn2kb(pmp, lbn), blsize, - NOCRED, 0, &bp); + 0, &bp); if (error) { goto bad; } @@ -1105,7 +1105,7 @@ abortit: } else bn = cntobn(pmp, cn); error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), - pmp->pm_bpcluster, NOCRED, B_MODIFY, &bp); + pmp->pm_bpcluster, B_MODIFY, &bp); if (error) { /* XXX should really panic here, fs is corrupt */ VOP_UNLOCK(fvp); @@ -1496,7 +1496,7 @@ msdosfs_readdir(void *v) if ((error = pcbmap(dep, lbn, &bn, &cn, &blsize)) != 0) break; error = bread(pmp->pm_devvp, de_bn2kb(pmp, bn), blsize, - NOCRED, 0, &bp); + 0, &bp); if (error) { goto bad; } Index: src/sys/fs/nilfs/nilfs_subr.c diff -u src/sys/fs/nilfs/nilfs_subr.c:1.12 src/sys/fs/nilfs/nilfs_subr.c:1.13 --- src/sys/fs/nilfs/nilfs_subr.c:1.12 Wed Oct 15 09:05:46 2014 +++ src/sys/fs/nilfs/nilfs_subr.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: nilfs_subr.c,v 1.12 2014/10/15 09:05:46 hannken Exp $ */ +/* $NetBSD: nilfs_subr.c,v 1.13 2015/03/28 19:24:05 maxv Exp $ */ /* * Copyright (c) 2008, 2009 Reinoud Zandijk @@ -28,7 +28,7 @@ #include <sys/cdefs.h> #ifndef lint -__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.12 2014/10/15 09:05:46 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.13 2015/03/28 19:24:05 maxv Exp $"); #endif /* not lint */ #include <sys/param.h> @@ -133,7 +133,7 @@ nilfs_dev_bread(struct nilfs_device *nil int blk2dev = nilfsdev->blocksize / DEV_BSIZE; return bread(nilfsdev->devvp, blocknr * blk2dev, nilfsdev->blocksize, - NOCRED, 0, bpp); + 0, bpp); } @@ -159,7 +159,7 @@ nilfs_bread(struct nilfs_node *node, uin } return bread(node->vnode, vblocknr, node->nilfsdev->blocksize, - cred, flags, bpp); + flags, bpp); } Index: src/sys/fs/nilfs/nilfs_vfsops.c diff -u src/sys/fs/nilfs/nilfs_vfsops.c:1.20 src/sys/fs/nilfs/nilfs_vfsops.c:1.21 --- src/sys/fs/nilfs/nilfs_vfsops.c:1.20 Sat Feb 7 10:40:57 2015 +++ src/sys/fs/nilfs/nilfs_vfsops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: nilfs_vfsops.c,v 1.20 2015/02/07 10:40:57 maxv Exp $ */ +/* $NetBSD: nilfs_vfsops.c,v 1.21 2015/03/28 19:24:05 maxv Exp $ */ /* * Copyright (c) 2008, 2009 Reinoud Zandijk @@ -28,7 +28,7 @@ #include <sys/cdefs.h> #ifndef lint -__KERNEL_RCSID(0, "$NetBSD: nilfs_vfsops.c,v 1.20 2015/02/07 10:40:57 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nilfs_vfsops.c,v 1.21 2015/03/28 19:24:05 maxv Exp $"); #endif /* not lint */ @@ -382,7 +382,7 @@ nilfs_read_superblock(struct nilfs_devic /* read our superblock regardless of backing device blocksize */ dev_blk = 0; dev_blks = (sb1off + dev_bsize -1)/dev_bsize; - error = bread(nilfsdev->devvp, dev_blk, dev_blks * dev_bsize, NOCRED, 0, &bp); + error = bread(nilfsdev->devvp, dev_blk, dev_blks * dev_bsize, 0, &bp); if (error) { return error; } @@ -396,7 +396,7 @@ nilfs_read_superblock(struct nilfs_devic /* read our 2nd superblock regardless of backing device blocksize */ dev_blk = sb2off / dev_bsize; dev_blks = 2; /* assumption max one dev_bsize */ - error = bread(nilfsdev->devvp, dev_blk, dev_blks * dev_bsize, NOCRED, 0, &bp); + error = bread(nilfsdev->devvp, dev_blk, dev_blks * dev_bsize, 0, &bp); if (error) { return error; } @@ -717,7 +717,7 @@ nilfs_mount_checkpoint(struct nilfs_moun cp_node = ump->nilfsdev->cp_node; /* get cpfile header from 1st block of cp file */ - error = nilfs_bread(cp_node, 0, NOCRED, 0, &bp); + error = nilfs_bread(cp_node, 0, 0, &bp); if (error) return error; cphdr = (struct nilfs_cpfile_header *) bp->b_data; @@ -742,7 +742,7 @@ nilfs_mount_checkpoint(struct nilfs_moun blocknr = fcpno / cp_per_block; off = (fcpno % cp_per_block) * dlen; - error = nilfs_bread(cp_node, blocknr, NOCRED, 0, &bp); + error = nilfs_bread(cp_node, blocknr, 0, &bp); if (error) { printf("mount_nilfs: couldn't read cp block %"PRIu64"\n", fcpno); @@ -1136,7 +1136,7 @@ nilfs_loadvnode(struct mount *mp, struct nilfsdev = ump->nilfsdev; nilfs_mdt_trans(&nilfsdev->ifile_mdt, ino, &ivblocknr, &entry_in_block); - error = nilfs_bread(ump->ifile_node, ivblocknr, NOCRED, 0, &bp); + error = nilfs_bread(ump->ifile_node, ivblocknr, 0, &bp); if (error) return ENOENT; Index: src/sys/fs/ntfs/ntfs_subr.c diff -u src/sys/fs/ntfs/ntfs_subr.c:1.60 src/sys/fs/ntfs/ntfs_subr.c:1.61 --- src/sys/fs/ntfs/ntfs_subr.c:1.60 Fri Feb 20 17:08:13 2015 +++ src/sys/fs/ntfs/ntfs_subr.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ntfs_subr.c,v 1.60 2015/02/20 17:08:13 maxv Exp $ */ +/* $NetBSD: ntfs_subr.c,v 1.61 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1998, 1999 Semen Ustimenko (sem...@freebsd.org) @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.60 2015/02/20 17:08:13 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.61 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -284,7 +284,7 @@ ntfs_loadntnode(struct ntfsmount *ntmp, off = ntfs_btocnoff(boff); error = bread(ntmp->ntm_devvp, bn, ntfs_cntob(1), - NOCRED, 0, &bp); + 0, &bp); if (error) { printf("%s: BREAD FAILED\n", __func__); goto out; @@ -1306,7 +1306,7 @@ ntfs_writentvattr_plain(struct ntfsmount clrbuf(bp); } else { error = bread(ntmp->ntm_devvp, ntfs_cntobn(cn), - ntfs_cntob(cl), NOCRED, B_MODIFY, &bp); + ntfs_cntob(cl), B_MODIFY, &bp); if (error) return (error); } @@ -1404,7 +1404,7 @@ ntfs_readntvattr_plain(struct ntfsmount error = bread(ntmp->ntm_devvp, ntfs_cntobn(cn), ntfs_cntob(cl), - NOCRED, 0, &bp); + 0, &bp); if (error) { return (error); } Index: src/sys/fs/ntfs/ntfs_vfsops.c diff -u src/sys/fs/ntfs/ntfs_vfsops.c:1.103 src/sys/fs/ntfs/ntfs_vfsops.c:1.104 --- src/sys/fs/ntfs/ntfs_vfsops.c:1.103 Fri Feb 20 17:08:13 2015 +++ src/sys/fs/ntfs/ntfs_vfsops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ntfs_vfsops.c,v 1.103 2015/02/20 17:08:13 maxv Exp $ */ +/* $NetBSD: ntfs_vfsops.c,v 1.104 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1998, 1999 Semen Ustimenko @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.103 2015/02/20 17:08:13 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.104 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -336,7 +336,7 @@ ntfs_mountfs(struct vnode *devvp, struct bp = NULL; - error = bread(devvp, BBLOCK, BBSIZE, NOCRED, 0, &bp); + error = bread(devvp, BBLOCK, BBSIZE, 0, &bp); if (error) goto out; ntmp = malloc(sizeof(*ntmp), M_NTFSMNT, M_WAITOK|M_ZERO); Index: src/sys/fs/sysvbfs/bfs_sysvbfs.c diff -u src/sys/fs/sysvbfs/bfs_sysvbfs.c:1.10 src/sys/fs/sysvbfs/bfs_sysvbfs.c:1.11 --- src/sys/fs/sysvbfs/bfs_sysvbfs.c:1.10 Fri May 16 09:21:59 2008 +++ src/sys/fs/sysvbfs/bfs_sysvbfs.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bfs_sysvbfs.c,v 1.10 2008/05/16 09:21:59 hannken Exp $ */ +/* $NetBSD: bfs_sysvbfs.c,v 1.11 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bfs_sysvbfs.c,v 1.10 2008/05/16 09:21:59 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bfs_sysvbfs.c,v 1.11 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -103,7 +103,7 @@ bc_read(void *self, uint8_t *buf, daddr_ struct bc_io_ops *bio = self; struct buf *bp = NULL; - if (bread(bio->vp, block, DEV_BSIZE, bio->cred, 0, &bp) != 0) + if (bread(bio->vp, block, DEV_BSIZE, 0, &bp) != 0) goto error_exit; memcpy(buf, bp->b_data, DEV_BSIZE); brelse(bp, 0); Index: src/sys/fs/v7fs/v7fs_io_kern.c diff -u src/sys/fs/v7fs/v7fs_io_kern.c:1.2 src/sys/fs/v7fs/v7fs_io_kern.c:1.3 --- src/sys/fs/v7fs/v7fs_io_kern.c:1.2 Wed Nov 20 23:44:23 2013 +++ src/sys/fs/v7fs/v7fs_io_kern.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: v7fs_io_kern.c,v 1.2 2013/11/20 23:44:23 rmind Exp $ */ +/* $NetBSD: v7fs_io_kern.c,v 1.3 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 2004, 2011 The NetBSD Foundation, Inc. @@ -30,13 +30,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: v7fs_io_kern.c,v 1.2 2013/11/20 23:44:23 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: v7fs_io_kern.c,v 1.3 2015/03/28 19:24:05 maxv Exp $"); #if defined _KERNEL_OPT #include "opt_v7fs.h" #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: v7fs_io_kern.c,v 1.2 2013/11/20 23:44:23 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: v7fs_io_kern.c,v 1.3 2015/03/28 19:24:05 maxv Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -176,7 +176,7 @@ v7fs_os_read(void *self, uint8_t *buf, d struct local_io *bio = (struct local_io *)self; struct buf *bp = NULL; - if (bread(bio->vp, block, DEV_BSIZE, bio->cred, 0, &bp) != 0) + if (bread(bio->vp, block, DEV_BSIZE, 0, &bp) != 0) goto error_exit; memcpy(buf, bp->b_data, DEV_BSIZE); brelse(bp, 0); Index: src/sys/kern/vfs_bio.c diff -u src/sys/kern/vfs_bio.c:1.254 src/sys/kern/vfs_bio.c:1.255 --- src/sys/kern/vfs_bio.c:1.254 Sat Mar 28 17:23:42 2015 +++ src/sys/kern/vfs_bio.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_bio.c,v 1.254 2015/03/28 17:23:42 maxv Exp $ */ +/* $NetBSD: vfs_bio.c,v 1.255 2015/03/28 19:24:04 maxv Exp $ */ /*- * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -123,7 +123,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.254 2015/03/28 17:23:42 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.255 2015/03/28 19:24:04 maxv Exp $"); #include "opt_bufcache.h" @@ -717,8 +717,7 @@ bio_doread(struct vnode *vp, daddr_t blk * This algorithm described in Bach (p.54). */ int -bread(struct vnode *vp, daddr_t blkno, int size, kauth_cred_t cred, - int flags, buf_t **bpp) +bread(struct vnode *vp, daddr_t blkno, int size, int flags, buf_t **bpp) { buf_t *bp; int error; Index: src/sys/miscfs/specfs/spec_vnops.c diff -u src/sys/miscfs/specfs/spec_vnops.c:1.145 src/sys/miscfs/specfs/spec_vnops.c:1.146 --- src/sys/miscfs/specfs/spec_vnops.c:1.145 Fri Jul 25 08:20:53 2014 +++ src/sys/miscfs/specfs/spec_vnops.c Sat Mar 28 19:24:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: spec_vnops.c,v 1.145 2014/07/25 08:20:53 dholland Exp $ */ +/* $NetBSD: spec_vnops.c,v 1.146 2015/03/28 19:24:06 maxv Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.145 2014/07/25 08:20:53 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.146 2015/03/28 19:24:06 maxv Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -738,7 +738,7 @@ spec_read(void *v) bn = (uio->uio_offset >> DEV_BSHIFT) &~ (bscale - 1); on = uio->uio_offset % bsize; n = min((unsigned)(bsize - on), uio->uio_resid); - error = bread(vp, bn, bsize, NOCRED, 0, &bp); + error = bread(vp, bn, bsize, 0, &bp); if (error) { return (error); } @@ -814,8 +814,7 @@ spec_write(void *v) if (n == bsize) bp = getblk(vp, bn, bsize, 0, 0); else - error = bread(vp, bn, bsize, NOCRED, - B_MODIFY, &bp); + error = bread(vp, bn, bsize, B_MODIFY, &bp); if (error) { return (error); } Index: src/sys/sys/buf.h diff -u src/sys/sys/buf.h:1.120 src/sys/sys/buf.h:1.121 --- src/sys/sys/buf.h:1.120 Sat Mar 28 17:23:43 2015 +++ src/sys/sys/buf.h Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: buf.h,v 1.120 2015/03/28 17:23:43 maxv Exp $ */ +/* $NetBSD: buf.h,v 1.121 2015/03/28 19:24:04 maxv Exp $ */ /*- * Copyright (c) 1999, 2000, 2007, 2008 The NetBSD Foundation, Inc. @@ -267,7 +267,7 @@ void bawrite(buf_t *); void bdwrite(buf_t *); void biodone(buf_t *); int biowait(buf_t *); -int bread(struct vnode *, daddr_t, int, struct kauth_cred *, int, buf_t **); +int bread(struct vnode *, daddr_t, int, int, buf_t **); int breadn(struct vnode *, daddr_t, int, daddr_t *, int *, int, int, buf_t **); void brelsel(buf_t *, int); Index: src/sys/ufs/chfs/chfs_vnops.c diff -u src/sys/ufs/chfs/chfs_vnops.c:1.26 src/sys/ufs/chfs/chfs_vnops.c:1.27 --- src/sys/ufs/chfs/chfs_vnops.c:1.26 Sat Mar 28 17:23:42 2015 +++ src/sys/ufs/chfs/chfs_vnops.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: chfs_vnops.c,v 1.26 2015/03/28 17:23:42 maxv Exp $ */ +/* $NetBSD: chfs_vnops.c,v 1.27 2015/03/28 19:24:04 maxv Exp $ */ /*- * Copyright (c) 2010 Department of Software Engineering, @@ -694,7 +694,7 @@ chfs_read(void *v) bytesinfile); if (chfs_lblktosize(chmp, nextlbn) >= ip->size) { - error = bread(vp, lbn, size, NOCRED, 0, &bp); + error = bread(vp, lbn, size, 0, &bp); dbg("after bread\n"); } else { int nextsize = chfs_blksize(chmp, ip, nextlbn); Index: src/sys/ufs/ext2fs/ext2fs_alloc.c diff -u src/sys/ufs/ext2fs/ext2fs_alloc.c:1.45 src/sys/ufs/ext2fs/ext2fs_alloc.c:1.46 --- src/sys/ufs/ext2fs/ext2fs_alloc.c:1.45 Sun Jun 23 02:06:05 2013 +++ src/sys/ufs/ext2fs/ext2fs_alloc.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_alloc.c,v 1.45 2013/06/23 02:06:05 dholland Exp $ */ +/* $NetBSD: ext2fs_alloc.c,v 1.46 2015/03/28 19:24:04 maxv Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.45 2013/06/23 02:06:05 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.46 2015/03/28 19:24:04 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -357,7 +357,7 @@ ext2fs_alloccg(struct inode *ip, int cg, return (0); error = bread(ip->i_devvp, EXT2_FSBTODB(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap), - (int)fs->e2fs_bsize, NOCRED, B_MODIFY, &bp); + (int)fs->e2fs_bsize, B_MODIFY, &bp); if (error) { return (0); } @@ -443,7 +443,7 @@ ext2fs_nodealloccg(struct inode *ip, int return (0); error = bread(ip->i_devvp, EXT2_FSBTODB(fs, fs->e2fs_gd[cg].ext2bgd_i_bitmap), - (int)fs->e2fs_bsize, NOCRED, B_MODIFY, &bp); + (int)fs->e2fs_bsize, B_MODIFY, &bp); if (error) { return (0); } @@ -510,7 +510,7 @@ ext2fs_blkfree(struct inode *ip, daddr_t } error = bread(ip->i_devvp, EXT2_FSBTODB(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap), - (int)fs->e2fs_bsize, NOCRED, B_MODIFY, &bp); + (int)fs->e2fs_bsize, B_MODIFY, &bp); if (error) { return; } @@ -553,7 +553,7 @@ ext2fs_vfree(struct vnode *pvp, ino_t in cg = ino_to_cg(fs, ino); error = bread(pip->i_devvp, EXT2_FSBTODB(fs, fs->e2fs_gd[cg].ext2bgd_i_bitmap), - (int)fs->e2fs_bsize, NOCRED, B_MODIFY, &bp); + (int)fs->e2fs_bsize, B_MODIFY, &bp); if (error) { return (0); } Index: src/sys/ufs/ext2fs/ext2fs_balloc.c diff -u src/sys/ufs/ext2fs/ext2fs_balloc.c:1.39 src/sys/ufs/ext2fs/ext2fs_balloc.c:1.40 --- src/sys/ufs/ext2fs/ext2fs_balloc.c:1.39 Sun Jun 23 07:28:37 2013 +++ src/sys/ufs/ext2fs/ext2fs_balloc.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_balloc.c,v 1.39 2013/06/23 07:28:37 dholland Exp $ */ +/* $NetBSD: ext2fs_balloc.c,v 1.40 2015/03/28 19:24:04 maxv Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ext2fs_balloc.c,v 1.39 2013/06/23 07:28:37 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ext2fs_balloc.c,v 1.40 2015/03/28 19:24:04 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_uvmhist.h" @@ -129,7 +129,7 @@ ext2fs_balloc(struct inode *ip, daddr_t */ if (bpp != NULL) { - error = bread(vp, bn, fs->e2fs_bsize, NOCRED, + error = bread(vp, bn, fs->e2fs_bsize, B_MODIFY, &bp); if (error) { return (error); @@ -208,7 +208,7 @@ ext2fs_balloc(struct inode *ip, daddr_t */ for (i = 1;;) { error = bread(vp, - indirs[i].in_lbn, (int)fs->e2fs_bsize, NOCRED, 0, &bp); + indirs[i].in_lbn, (int)fs->e2fs_bsize, 0, &bp); if (error) { goto fail; } @@ -292,7 +292,7 @@ ext2fs_balloc(struct inode *ip, daddr_t brelse(bp, 0); if (bpp != NULL) { if (flags & B_CLRBUF) { - error = bread(vp, lbn, (int)fs->e2fs_bsize, NOCRED, + error = bread(vp, lbn, (int)fs->e2fs_bsize, B_MODIFY, &nbp); if (error) { goto fail; @@ -320,7 +320,7 @@ fail: int r; r = bread(vp, indirs[unwindidx].in_lbn, - (int)fs->e2fs_bsize, NOCRED, B_MODIFY, &bp); + (int)fs->e2fs_bsize, B_MODIFY, &bp); if (r) { panic("Could not unwind indirect block, error %d", r); } else { Index: src/sys/ufs/ext2fs/ext2fs_inode.c diff -u src/sys/ufs/ext2fs/ext2fs_inode.c:1.81 src/sys/ufs/ext2fs/ext2fs_inode.c:1.82 --- src/sys/ufs/ext2fs/ext2fs_inode.c:1.81 Sun Jun 23 07:28:37 2013 +++ src/sys/ufs/ext2fs/ext2fs_inode.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_inode.c,v 1.81 2013/06/23 07:28:37 dholland Exp $ */ +/* $NetBSD: ext2fs_inode.c,v 1.82 2015/03/28 19:24:04 maxv Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.81 2013/06/23 07:28:37 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.82 2015/03/28 19:24:04 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -262,7 +262,7 @@ ext2fs_update(struct vnode *vp, const st error = bread(ip->i_devvp, EXT2_FSBTODB(fs, ino_to_fsba(fs, ip->i_number)), - (int)fs->e2fs_bsize, NOCRED, B_MODIFY, &bp); + (int)fs->e2fs_bsize, B_MODIFY, &bp); if (error) { return (error); } Index: src/sys/ufs/ext2fs/ext2fs_readwrite.c diff -u src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.73 src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.74 --- src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.73 Sat Mar 28 17:45:47 2015 +++ src/sys/ufs/ext2fs/ext2fs_readwrite.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_readwrite.c,v 1.73 2015/03/28 17:45:47 riastradh Exp $ */ +/* $NetBSD: ext2fs_readwrite.c,v 1.74 2015/03/28 19:24:04 maxv Exp $ */ /*- * Copyright (c) 1993 @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.73 2015/03/28 17:45:47 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.74 2015/03/28 19:24:04 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -196,7 +196,7 @@ ext2fs_bufrd(struct vnode *vp, struct ui xfersize = bytesinfile; if (ext2_lblktosize(fs, nextlbn) >= ext2fs_size(ip)) - error = bread(vp, lbn, size, NOCRED, 0, &bp); + error = bread(vp, lbn, size, 0, &bp); else { int nextsize = fs->e2fs_bsize; error = breadn(vp, lbn, Index: src/sys/ufs/ext2fs/ext2fs_subr.c diff -u src/sys/ufs/ext2fs/ext2fs_subr.c:1.30 src/sys/ufs/ext2fs/ext2fs_subr.c:1.31 --- src/sys/ufs/ext2fs/ext2fs_subr.c:1.30 Sun Jun 23 07:28:37 2013 +++ src/sys/ufs/ext2fs/ext2fs_subr.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_subr.c,v 1.30 2013/06/23 07:28:37 dholland Exp $ */ +/* $NetBSD: ext2fs_subr.c,v 1.31 2015/03/28 19:24:04 maxv Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ext2fs_subr.c,v 1.30 2013/06/23 07:28:37 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ext2fs_subr.c,v 1.31 2015/03/28 19:24:04 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -92,7 +92,7 @@ ext2fs_blkatoff(struct vnode *vp, off_t lbn = ext2_lblkno(fs, offset); *bpp = NULL; - if ((error = bread(vp, lbn, fs->e2fs_bsize, NOCRED, 0, &bp)) != 0) { + if ((error = bread(vp, lbn, fs->e2fs_bsize, 0, &bp)) != 0) { return (error); } if (res) Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.192 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.193 --- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.192 Fri Mar 27 17:27:56 2015 +++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_vfsops.c,v 1.192 2015/03/27 17:27:56 riastradh Exp $ */ +/* $NetBSD: ext2fs_vfsops.c,v 1.193 2015/03/28 19:24:04 maxv Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1994 @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.192 2015/03/27 17:27:56 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.193 2015/03/28 19:24:04 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -541,7 +541,7 @@ ext2fs_reload(struct mount *mp, kauth_cr * Step 2: re-read superblock from disk. Copy in new superblock, and compute * in-memory values. */ - error = bread(devvp, SBLOCK, SBSIZE, NOCRED, 0, &bp); + error = bread(devvp, SBLOCK, SBSIZE, 0, &bp); if (error) return error; newfs = (struct ext2fs *)bp->b_data; @@ -560,7 +560,7 @@ ext2fs_reload(struct mount *mp, kauth_cr error = bread(devvp , EXT2_FSBTODB(fs, fs->e2fs.e2fs_first_dblock + 1 /* superblock */ + i), - fs->e2fs_bsize, NOCRED, 0, &bp); + fs->e2fs_bsize, 0, &bp); if (error) { return (error); } @@ -591,7 +591,7 @@ ext2fs_reload(struct mount *mp, kauth_cr */ ip = VTOI(vp); error = bread(devvp, EXT2_FSBTODB(fs, ino_to_fsba(fs, ip->i_number)), - (int)fs->e2fs_bsize, NOCRED, 0, &bp); + (int)fs->e2fs_bsize, 0, &bp); if (error) { vput(vp); break; @@ -638,7 +638,7 @@ ext2fs_mountfs(struct vnode *devvp, stru ump = NULL; /* Read the superblock from disk, and swap it directly. */ - error = bread(devvp, SBLOCK, SBSIZE, cred, 0, &bp); + error = bread(devvp, SBLOCK, SBSIZE, 0, &bp); if (error) goto out; fs = (struct ext2fs *)bp->b_data; @@ -675,7 +675,7 @@ ext2fs_mountfs(struct vnode *devvp, stru error = bread(devvp, EXT2_FSBTODB(m_fs, m_fs->e2fs.e2fs_first_dblock + 1 /* superblock */ + i), - m_fs->e2fs_bsize, NOCRED, 0, &bp); + m_fs->e2fs_bsize, 0, &bp); if (error) { kmem_free(m_fs->e2fs_gd, m_fs->e2fs_ngdb * m_fs->e2fs_bsize); @@ -944,7 +944,7 @@ ext2fs_loadvnode(struct mount *mp, struc /* Read in the disk contents for the inode, copy into the inode. */ error = bread(ump->um_devvp, EXT2_FSBTODB(fs, ino_to_fsba(fs, ino)), - (int)fs->e2fs_bsize, NOCRED, 0, &bp); + (int)fs->e2fs_bsize, 0, &bp); if (error) return error; Index: src/sys/ufs/ffs/ffs_alloc.c diff -u src/sys/ufs/ffs/ffs_alloc.c:1.148 src/sys/ufs/ffs/ffs_alloc.c:1.149 --- src/sys/ufs/ffs/ffs_alloc.c:1.148 Tue Mar 17 09:39:29 2015 +++ src/sys/ufs/ffs/ffs_alloc.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_alloc.c,v 1.148 2015/03/17 09:39:29 hannken Exp $ */ +/* $NetBSD: ffs_alloc.c,v 1.149 2015/03/28 19:24:04 maxv Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.148 2015/03/17 09:39:29 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.149 2015/03/28 19:24:04 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -382,7 +382,7 @@ ffs_realloccg(struct inode *ip, daddr_t * Allocate the extra space in the buffer. */ if (bpp != NULL && - (error = bread(ITOV(ip), lbprev, osize, NOCRED, 0, &bp)) != 0) { + (error = bread(ITOV(ip), lbprev, osize, 0, &bp)) != 0) { return (error); } #if defined(QUOTA) || defined(QUOTA2) @@ -980,7 +980,7 @@ ffs_fragextend(struct inode *ip, int cg, } mutex_exit(&ump->um_lock); error = bread(ip->i_devvp, FFS_FSBTODB(fs, cgtod(fs, cg)), - (int)fs->fs_cgsize, NOCRED, B_MODIFY, &bp); + (int)fs->fs_cgsize, B_MODIFY, &bp); if (error) goto fail; cgp = (struct cg *)bp->b_data; @@ -1054,7 +1054,7 @@ ffs_alloccg(struct inode *ip, int cg, da return (0); mutex_exit(&ump->um_lock); error = bread(ip->i_devvp, FFS_FSBTODB(fs, cgtod(fs, cg)), - (int)fs->fs_cgsize, NOCRED, B_MODIFY, &bp); + (int)fs->fs_cgsize, B_MODIFY, &bp); if (error) goto fail; cgp = (struct cg *)bp->b_data; @@ -1247,7 +1247,7 @@ ffs_nodealloccg(struct inode *ip, int cg initediblk = -1; retry: error = bread(ip->i_devvp, FFS_FSBTODB(fs, cgtod(fs, cg)), - (int)fs->fs_cgsize, NOCRED, B_MODIFY, &bp); + (int)fs->fs_cgsize, B_MODIFY, &bp); if (error) goto fail; cgp = (struct cg *)bp->b_data; @@ -1408,7 +1408,7 @@ ffs_blkalloc_ump(struct ufsmount *ump, d cg = dtog(fs, bno); error = bread(ump->um_devvp, FFS_FSBTODB(fs, cgtod(fs, cg)), - (int)fs->fs_cgsize, NOCRED, B_MODIFY, &bp); + (int)fs->fs_cgsize, B_MODIFY, &bp); if (error) { return error; } @@ -1516,7 +1516,7 @@ ffs_blkfree_cg(struct fs *fs, struct vno cgblkno = FFS_FSBTODB(fs, cgtod(fs, cg)); error = bread(devvp, cgblkno, (int)fs->fs_cgsize, - NOCRED, B_MODIFY, &bp); + B_MODIFY, &bp); if (error) { return; } @@ -1783,7 +1783,7 @@ ffs_blkfree_snap(struct fs *fs, struct v return; error = bread(devvp, cgblkno, (int)fs->fs_cgsize, - NOCRED, B_MODIFY, &bp); + B_MODIFY, &bp); if (error) { return; } @@ -1941,7 +1941,7 @@ ffs_freefile(struct mount *mp, ino_t ino panic("ifree: range: dev = 0x%llx, ino = %llu, fs = %s", (long long)dev, (unsigned long long)ino, fs->fs_fsmnt); error = bread(devvp, cgbno, (int)fs->fs_cgsize, - NOCRED, B_MODIFY, &bp); + B_MODIFY, &bp); if (error) { return (error); } @@ -1980,7 +1980,7 @@ ffs_freefile_snap(struct fs *fs, struct (unsigned long long)dev, (unsigned long long)ino, fs->fs_fsmnt); error = bread(devvp, cgbno, (int)fs->fs_cgsize, - NOCRED, B_MODIFY, &bp); + B_MODIFY, &bp); if (error) { return (error); } @@ -2062,7 +2062,7 @@ ffs_checkfreefile(struct fs *fs, struct cgbno = FFS_FSBTODB(fs, cgtod(fs, cg)); if ((u_int)ino >= fs->fs_ipg * fs->fs_ncg) return 1; - if (bread(devvp, cgbno, (int)fs->fs_cgsize, NOCRED, 0, &bp)) { + if (bread(devvp, cgbno, (int)fs->fs_cgsize, 0, &bp)) { return 1; } cgp = (struct cg *)bp->b_data; Index: src/sys/ufs/ffs/ffs_balloc.c diff -u src/sys/ufs/ffs/ffs_balloc.c:1.60 src/sys/ufs/ffs/ffs_balloc.c:1.61 --- src/sys/ufs/ffs/ffs_balloc.c:1.60 Sun Oct 20 00:29:10 2013 +++ src/sys/ufs/ffs/ffs_balloc.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_balloc.c,v 1.60 2013/10/20 00:29:10 htodd Exp $ */ +/* $NetBSD: ffs_balloc.c,v 1.61 2015/03/28 19:24:04 maxv Exp $ */ /* * Copyright (c) 2002 Networks Associates Technology, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.60 2013/10/20 00:29:10 htodd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.61 2015/03/28 19:24:04 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_quota.h" @@ -174,7 +174,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t */ if (bpp != NULL) { - error = bread(vp, lbn, fs->fs_bsize, NOCRED, + error = bread(vp, lbn, fs->fs_bsize, B_MODIFY, bpp); if (error) { return (error); @@ -199,7 +199,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t */ if (bpp != NULL) { - error = bread(vp, lbn, osize, NOCRED, + error = bread(vp, lbn, osize, B_MODIFY, bpp); if (error) { return (error); @@ -297,7 +297,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t for (i = 1;;) { error = bread(vp, - indirs[i].in_lbn, (int)fs->fs_bsize, NOCRED, 0, &bp); + indirs[i].in_lbn, (int)fs->fs_bsize, 0, &bp); if (error) { goto fail; } @@ -415,7 +415,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t if (bpp != NULL) { if (flags & B_CLRBUF) { error = bread(vp, lbn, (int)fs->fs_bsize, - NOCRED, B_MODIFY, &nbp); + B_MODIFY, &nbp); if (error) { goto fail; } @@ -478,7 +478,7 @@ fail: int r; r = bread(vp, indirs[unwindidx].in_lbn, - (int)fs->fs_bsize, NOCRED, 0, &bp); + (int)fs->fs_bsize, 0, &bp); if (r) { panic("Could not unwind indirect block, error %d", r); } else { @@ -585,7 +585,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t nb = dp->di_extb[lbn]; if (nb != 0 && dp->di_extsize >= smalllblktosize(fs, lbn + 1)) { error = bread(vp, -1 - lbn, fs->fs_bsize, - NOCRED, 0, &bp); + 0, &bp); if (error) { return (error); } @@ -604,7 +604,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t nsize = ffs_fragroundup(fs, size); if (nsize <= osize) { error = bread(vp, -1 - lbn, osize, - NOCRED, 0, &bp); + 0, &bp); if (error) { return (error); } @@ -695,7 +695,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t */ if (bpp != NULL) { - error = bread(vp, lbn, fs->fs_bsize, NOCRED, + error = bread(vp, lbn, fs->fs_bsize, B_MODIFY, bpp); if (error) { return (error); @@ -720,7 +720,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t */ if (bpp != NULL) { - error = bread(vp, lbn, osize, NOCRED, + error = bread(vp, lbn, osize, B_MODIFY, bpp); if (error) { return (error); @@ -818,7 +818,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t for (i = 1;;) { error = bread(vp, - indirs[i].in_lbn, (int)fs->fs_bsize, NOCRED, 0, &bp); + indirs[i].in_lbn, (int)fs->fs_bsize, 0, &bp); if (error) { goto fail; } @@ -936,7 +936,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t if (bpp != NULL) { if (flags & B_CLRBUF) { error = bread(vp, lbn, (int)fs->fs_bsize, - NOCRED, B_MODIFY, &nbp); + B_MODIFY, &nbp); if (error) { goto fail; } @@ -1001,7 +1001,7 @@ fail: int r; r = bread(vp, indirs[unwindidx].in_lbn, - (int)fs->fs_bsize, NOCRED, 0, &bp); + (int)fs->fs_bsize, 0, &bp); if (r) { panic("Could not unwind indirect block, error %d", r); } else { Index: src/sys/ufs/ffs/ffs_inode.c diff -u src/sys/ufs/ffs/ffs_inode.c:1.116 src/sys/ufs/ffs/ffs_inode.c:1.117 --- src/sys/ufs/ffs/ffs_inode.c:1.116 Sun Oct 20 00:29:10 2013 +++ src/sys/ufs/ffs/ffs_inode.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_inode.c,v 1.116 2013/10/20 00:29:10 htodd Exp $ */ +/* $NetBSD: ffs_inode.c,v 1.117 2015/03/28 19:24:04 maxv Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.116 2013/10/20 00:29:10 htodd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.117 2015/03/28 19:24:04 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -149,7 +149,7 @@ ffs_update(struct vnode *vp, const struc } /* XXX */ error = bread(ip->i_devvp, FFS_FSBTODB(fs, ino_to_fsba(fs, ip->i_number)), - (int)fs->fs_bsize, NOCRED, B_MODIFY, &bp); + (int)fs->fs_bsize, B_MODIFY, &bp); if (error) { return (error); } Index: src/sys/ufs/ffs/ffs_snapshot.c diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.138 src/sys/ufs/ffs/ffs_snapshot.c:1.139 --- src/sys/ufs/ffs/ffs_snapshot.c:1.138 Sat Mar 28 17:23:42 2015 +++ src/sys/ufs/ffs/ffs_snapshot.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_snapshot.c,v 1.138 2015/03/28 17:23:42 maxv Exp $ */ +/* $NetBSD: ffs_snapshot.c,v 1.139 2015/03/28 19:24:04 maxv Exp $ */ /* * Copyright 2000 Marshall Kirk McKusick. All Rights Reserved. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.138 2015/03/28 17:23:42 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.139 2015/03/28 19:24:04 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -553,7 +553,6 @@ snapshot_copyfs(struct mount *mp, struct int32_t *lp; struct buf *bp; struct fs *copyfs, *fs = VFSTOUFS(mp)->um_fs; - struct lwp *l = curlwp; struct vnode *devvp = VTOI(vp)->i_devvp; /* @@ -582,7 +581,7 @@ snapshot_copyfs(struct mount *mp, struct len = (i == fs->fs_frag) ? 0 : i * fs->fs_fsize; if (len > 0) { if ((error = bread(devvp, FFS_FSBTODB(fs, fs->fs_csaddr + loc), - len, l->l_cred, 0, &bp)) != 0) { + len, 0, &bp)) != 0) { free(copyfs->fs_csp, M_UFSMNT); free(*sbbuf, M_UFSMNT); *sbbuf = NULL; @@ -860,7 +859,7 @@ snapshot_writefs(struct mount *mp, struc if (error) return error; for (loc = 0; loc < len; loc++) { - error = bread(vp, blkno + loc, fs->fs_bsize, l->l_cred, + error = bread(vp, blkno + loc, fs->fs_bsize, B_MODIFY, &bp); if (error) { break; @@ -872,7 +871,7 @@ snapshot_writefs(struct mount *mp, struc if (error) goto out; error = bread(vp, ffs_lblkno(fs, fs->fs_sblockloc), - fs->fs_bsize, l->l_cred, B_MODIFY, &bp); + fs->fs_bsize, B_MODIFY, &bp); if (error) { goto out; } else { @@ -966,7 +965,7 @@ cgaccount1(int cg, struct vnode *vp, voi fs = ip->i_fs; ns = UFS_FSNEEDSWAP(fs); error = bread(ip->i_devvp, FFS_FSBTODB(fs, cgtod(fs, cg)), - (int)fs->fs_cgsize, l->l_cred, 0, &bp); + (int)fs->fs_cgsize, 0, &bp); if (error) { return (error); } @@ -1062,7 +1061,7 @@ expunge(struct vnode *snapvp, struct ino if (error) return error; if (blkno != 0) { - error = bread(snapvp, lbn, fs->fs_bsize, l->l_cred, + error = bread(snapvp, lbn, fs->fs_bsize, B_MODIFY, &bp); } else { error = ffs_balloc(snapvp, ffs_lblktosize(fs, (off_t)lbn), @@ -2094,7 +2093,7 @@ ffs_snapshot_read(struct vnode *vp, stru if (ffs_lblktosize(fs, lbn) + size > fsbytes) size = ffs_fragroundup(fs, fsbytes - ffs_lblktosize(fs, lbn)); - error = bread(vp, lbn, size, NOCRED, 0, &bp); + error = bread(vp, lbn, size, 0, &bp); } else { int nextsize = fs->fs_bsize; error = breadn(vp, lbn, @@ -2162,7 +2161,7 @@ snapblkaddr(struct vnode *vp, daddr_t lb mutex_exit(&bufcache_lock); return error; } - error = bread(vp, indirs[num-1].in_lbn, fs->fs_bsize, NOCRED, 0, &bp); + error = bread(vp, indirs[num-1].in_lbn, fs->fs_bsize, 0, &bp); if (error == 0) { *res = idb_get(ip, bp->b_data, indirs[num-1].in_off); brelse(bp, 0); Index: src/sys/ufs/ffs/ffs_vfsops.c diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.326 src/sys/ufs/ffs/ffs_vfsops.c:1.327 --- src/sys/ufs/ffs/ffs_vfsops.c:1.326 Fri Mar 27 17:27:56 2015 +++ src/sys/ufs/ffs/ffs_vfsops.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_vfsops.c,v 1.326 2015/03/27 17:27:56 riastradh Exp $ */ +/* $NetBSD: ffs_vfsops.c,v 1.327 2015/03/28 19:24:04 maxv Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.326 2015/03/27 17:27:56 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.327 2015/03/28 19:24:04 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -723,7 +723,7 @@ ffs_reload(struct mount *mp, kauth_cred_ fs = ump->um_fs; fs_sbsize = fs->fs_sbsize; error = bread(devvp, fs->fs_sblockloc / DEV_BSIZE, fs_sbsize, - NOCRED, 0, &bp); + 0, &bp); if (error) return (error); newfs = kmem_alloc(fs_sbsize, KM_SLEEP); @@ -794,7 +794,7 @@ ffs_reload(struct mount *mp, kauth_cred_ */ error = bread(devvp, (daddr_t)(APPLEUFS_LABEL_OFFSET / DEV_BSIZE), - APPLEUFS_LABEL_SIZE, cred, 0, &bp); + APPLEUFS_LABEL_SIZE, 0, &bp); if (error && error != EINVAL) { return error; } @@ -855,7 +855,7 @@ ffs_reload(struct mount *mp, kauth_cred_ if (i + fs->fs_frag > blks) bsize = (blks - i) * fs->fs_fsize; error = bread(devvp, FFS_FSBTODB(fs, fs->fs_csaddr + i), bsize, - NOCRED, 0, &bp); + 0, &bp); if (error) { return (error); } @@ -899,7 +899,7 @@ ffs_reload(struct mount *mp, kauth_cred_ */ ip = VTOI(vp); error = bread(devvp, FFS_FSBTODB(fs, ino_to_fsba(fs, ip->i_number)), - (int)fs->fs_bsize, NOCRED, 0, &bp); + (int)fs->fs_bsize, 0, &bp); if (error) { vput(vp); break; @@ -1074,7 +1074,7 @@ ffs_mountfs(struct vnode *devvp, struct } error = bread(devvp, sblock_try[i] / DEV_BSIZE, SBLOCKSIZE, - cred, 0, &bp); + 0, &bp); if (error) { DPRINTF("bread@0x%x returned %d", sblock_try[i] / DEV_BSIZE, error); @@ -1250,7 +1250,7 @@ ffs_mountfs(struct vnode *devvp, struct */ error = bread(devvp, (daddr_t)(APPLEUFS_LABEL_OFFSET / DEV_BSIZE), - APPLEUFS_LABEL_SIZE, cred, 0, &bp); + APPLEUFS_LABEL_SIZE, 0, &bp); if (error) { DPRINTF("apple bread@0x%jx returned %d", (intmax_t)(APPLEUFS_LABEL_OFFSET / DEV_BSIZE), @@ -1308,7 +1308,7 @@ ffs_mountfs(struct vnode *devvp, struct */ if (!ronly) { error = bread(devvp, FFS_FSBTODB(fs, fs->fs_size - 1), - fs->fs_fsize, cred, 0, &bp); + fs->fs_fsize, 0, &bp); if (error) { DPRINTF("bread@0x%jx returned %d", (intmax_t)FFS_FSBTODB(fs, fs->fs_size - 1), @@ -1348,7 +1348,7 @@ ffs_mountfs(struct vnode *devvp, struct if (i + fs->fs_frag > blks) bsize = (blks - i) * fs->fs_fsize; error = bread(devvp, FFS_FSBTODB(fs, fs->fs_csaddr + i), bsize, - cred, 0, &bp); + 0, &bp); if (error) { DPRINTF("bread@0x%jx %d", (intmax_t)FFS_FSBTODB(fs, fs->fs_csaddr + i), @@ -1945,7 +1945,7 @@ ffs_init_vnode(struct ufsmount *ump, str /* Read in the disk contents for the inode. */ error = bread(ump->um_devvp, FFS_FSBTODB(fs, ino_to_fsba(fs, ino)), - (int)fs->fs_bsize, NOCRED, 0, &bp); + (int)fs->fs_bsize, 0, &bp); if (error) return error; Index: src/sys/ufs/ffs/ffs_wapbl.c diff -u src/sys/ufs/ffs/ffs_wapbl.c:1.29 src/sys/ufs/ffs/ffs_wapbl.c:1.30 --- src/sys/ufs/ffs/ffs_wapbl.c:1.29 Tue Mar 17 09:39:29 2015 +++ src/sys/ufs/ffs/ffs_wapbl.c Sat Mar 28 19:24:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_wapbl.c,v 1.29 2015/03/17 09:39:29 hannken Exp $ */ +/* $NetBSD: ffs_wapbl.c,v 1.30 2015/03/28 19:24:04 maxv Exp $ */ /*- * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.29 2015/03/17 09:39:29 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.30 2015/03/28 19:24:04 maxv Exp $"); #define WAPBL_INTERNAL @@ -829,7 +829,7 @@ wapbl_find_log_start(struct mount *mp, s s++, n = -n, cg += n * s) { DPRINTF("check cg %d of %d\n", cg, fs->fs_ncg); error = bread(devvp, FFS_FSBTODB(fs, cgtod(fs, cg)), - fs->fs_cgsize, FSCRED, 0, &bp); + fs->fs_cgsize, 0, &bp); if (error) { continue; } Index: src/sys/ufs/lfs/lfs.h diff -u src/sys/ufs/lfs/lfs.h:1.160 src/sys/ufs/lfs/lfs.h:1.161 --- src/sys/ufs/lfs/lfs.h:1.160 Sun Jul 28 01:22:55 2013 +++ src/sys/ufs/lfs/lfs.h Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs.h,v 1.160 2013/07/28 01:22:55 dholland Exp $ */ +/* $NetBSD: lfs.h,v 1.161 2015/03/28 19:24:05 maxv Exp $ */ /* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */ /* from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp */ @@ -555,7 +555,7 @@ struct segusage_v1 { VTOI((F)->lfs_ivnode)->i_flag |= IN_ACCESS; \ if ((_e = bread((F)->lfs_ivnode, \ ((IN) / (F)->lfs_sepb) + (F)->lfs_cleansz, \ - (F)->lfs_bsize, NOCRED, 0, &(BP))) != 0) \ + (F)->lfs_bsize, 0, &(BP))) != 0) \ panic("lfs: ifile read: %d", _e); \ if ((F)->lfs_version == 1) \ (SP) = (SEGUSE *)((SEGUSE_V1 *)(BP)->b_data + \ @@ -623,7 +623,7 @@ struct ifile_v1 { VTOI((F)->lfs_ivnode)->i_flag |= IN_ACCESS; \ if ((_e = bread((F)->lfs_ivnode, \ (IN) / (F)->lfs_ifpb + (F)->lfs_cleansz + (F)->lfs_segtabsz, \ - (F)->lfs_bsize, NOCRED, 0, &(BP))) != 0) \ + (F)->lfs_bsize, 0, &(BP))) != 0) \ panic("lfs: ifile ino %d read %d", (int)(IN), _e); \ if ((F)->lfs_version == 1) \ (IP) = (IFILE *)((IFILE_V1 *)(BP)->b_data + \ @@ -656,7 +656,7 @@ typedef struct _cleanerinfo { SHARE_IFLOCK(F); \ VTOI((F)->lfs_ivnode)->i_flag |= IN_ACCESS; \ if (bread((F)->lfs_ivnode, \ - (daddr_t)0, (F)->lfs_bsize, NOCRED, 0, &(BP))) \ + (daddr_t)0, (F)->lfs_bsize, 0, &(BP))) \ panic("lfs: ifile read"); \ (CP) = (CLEANERINFO *)(BP)->b_data; \ UNSHARE_IFLOCK(F); \ Index: src/sys/ufs/lfs/lfs_balloc.c diff -u src/sys/ufs/lfs/lfs_balloc.c:1.80 src/sys/ufs/lfs/lfs_balloc.c:1.81 --- src/sys/ufs/lfs/lfs_balloc.c:1.80 Sun Jul 28 01:25:06 2013 +++ src/sys/ufs/lfs/lfs_balloc.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_balloc.c,v 1.80 2013/07/28 01:25:06 dholland Exp $ */ +/* $NetBSD: lfs_balloc.c,v 1.81 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.80 2013/07/28 01:25:06 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.81 2015/03/28 19:24:05 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_quota.h" @@ -199,7 +199,7 @@ lfs_balloc(struct vnode *vp, off_t start if (nsize <= osize) { /* No need to extend */ if (bpp && (error = bread(vp, lbn, osize, - NOCRED, 0, &bp))) + 0, &bp))) return error; } else { /* Extend existing block */ @@ -329,7 +329,7 @@ lfs_balloc(struct vnode *vp, off_t start break; default: idp = &indirs[num - 1]; - if (bread(vp, idp->in_lbn, fs->lfs_bsize, NOCRED, + if (bread(vp, idp->in_lbn, fs->lfs_bsize, B_MODIFY, &ibp)) panic("lfs_balloc: bread bno %lld", (long long)idp->in_lbn); @@ -409,7 +409,7 @@ lfs_fragextend(struct vnode *vp, int osi * appropriate things and making sure it all goes to disk. * Don't bother to read in that case. */ - if (bpp && (error = bread(vp, lbn, osize, NOCRED, 0, bpp))) { + if (bpp && (error = bread(vp, lbn, osize, 0, bpp))) { goto out; } #if defined(LFS_QUOTA) || defined(LFS_QUOTA2) Index: src/sys/ufs/lfs/lfs_rfw.c diff -u src/sys/ufs/lfs/lfs_rfw.c:1.18 src/sys/ufs/lfs/lfs_rfw.c:1.19 --- src/sys/ufs/lfs/lfs_rfw.c:1.18 Sun Jul 28 01:05:52 2013 +++ src/sys/ufs/lfs/lfs_rfw.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_rfw.c,v 1.18 2013/07/28 01:05:52 dholland Exp $ */ +/* $NetBSD: lfs_rfw.c,v 1.19 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lfs_rfw.c,v 1.18 2013/07/28 01:05:52 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_rfw.c,v 1.19 2015/03/28 19:24:05 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_quota.h" @@ -316,7 +316,7 @@ update_inoblk(struct lfs *fs, daddr_t of * DO NOT update disk blocks, we do that separately. */ error = bread(devvp, LFS_FSBTODB(fs, offset), fs->lfs_ibsize, - cred, 0, &dbp); + 0, &dbp); if (error) { DLOG((DLOG_RF, "update_inoblk: bread returned %d\n", error)); return error; @@ -416,7 +416,7 @@ check_segsum(struct lfs *fs, daddr_t off /* Read in the segment summary */ error = bread(devvp, LFS_FSBTODB(fs, offset), fs->lfs_sumsize, - cred, 0, &bp); + 0, &bp); if (error) return -1; @@ -489,7 +489,7 @@ check_segsum(struct lfs *fs, daddr_t off if (flags & CHECK_CKSUM) { /* Read in the head and add to the buffer */ error = bread(devvp, LFS_FSBTODB(fs, offset), fs->lfs_bsize, - cred, 0, &dbp); + 0, &dbp); if (error) { offset = -1; goto err2; @@ -516,7 +516,7 @@ check_segsum(struct lfs *fs, daddr_t off size = fip->fi_lastlength; if (flags & CHECK_CKSUM) { error = bread(devvp, LFS_FSBTODB(fs, offset), size, - cred, 0, &dbp); + 0, &dbp); if (error) { offset = -1; goto err2; Index: src/sys/ufs/lfs/lfs_segment.c diff -u src/sys/ufs/lfs/lfs_segment.c:1.236 src/sys/ufs/lfs/lfs_segment.c:1.237 --- src/sys/ufs/lfs/lfs_segment.c:1.236 Mon Mar 24 13:42:40 2014 +++ src/sys/ufs/lfs/lfs_segment.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_segment.c,v 1.236 2014/03/24 13:42:40 hannken Exp $ */ +/* $NetBSD: lfs_segment.c,v 1.237 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.236 2014/03/24 13:42:40 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.237 2015/03/28 19:24:05 maxv Exp $"); #define _VFS_VNODE_PRIVATE /* XXX: check for VI_MARKER, this has to go */ @@ -702,7 +702,7 @@ lfs_segwrite(struct mount *mp, int flags for (n = 0; n < fs->lfs_segtabsz; n++) { dirty = 0; if (bread(fs->lfs_ivnode, fs->lfs_cleansz + n, - fs->lfs_bsize, NOCRED, B_MODIFY, &bp)) + fs->lfs_bsize, B_MODIFY, &bp)) panic("lfs_segwrite: ifile read"); segusep = (SEGUSE *)bp->b_data; maxseg = min(segleft, fs->lfs_sepb); @@ -1504,7 +1504,7 @@ lfs_update_single(struct lfs *fs, struct break; default: ap = &a[num - 1]; - if (bread(vp, ap->in_lbn, fs->lfs_bsize, NOCRED, + if (bread(vp, ap->in_lbn, fs->lfs_bsize, B_MODIFY, &bp)) panic("lfs_updatemeta: bread bno %" PRId64, ap->in_lbn); Index: src/sys/ufs/lfs/lfs_syscalls.c diff -u src/sys/ufs/lfs/lfs_syscalls.c:1.155 src/sys/ufs/lfs/lfs_syscalls.c:1.156 --- src/sys/ufs/lfs/lfs_syscalls.c:1.155 Thu Apr 17 18:15:49 2014 +++ src/sys/ufs/lfs/lfs_syscalls.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_syscalls.c,v 1.155 2014/04/17 18:15:49 pgoyette Exp $ */ +/* $NetBSD: lfs_syscalls.c,v 1.156 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007, 2008 @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.155 2014/04/17 18:15:49 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.156 2015/03/28 19:24:05 maxv Exp $"); #ifndef LFS # define LFS /* for prototypes in syscallargs.h */ @@ -1182,7 +1182,7 @@ lfs_fastvget(struct mount *mp, ino_t ino retries = 0; again: error = bread(ump->um_devvp, LFS_FSBTODB(fs, daddr), fs->lfs_ibsize, - NOCRED, 0, &bp); + 0, &bp); if (error) { DLOG((DLOG_CLEAN, "lfs_fastvget: bread failed (%d)\n", error)); Index: src/sys/ufs/lfs/lfs_vfsops.c diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.321 src/sys/ufs/lfs/lfs_vfsops.c:1.322 --- src/sys/ufs/lfs/lfs_vfsops.c:1.321 Wed Apr 16 18:55:19 2014 +++ src/sys/ufs/lfs/lfs_vfsops.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_vfsops.c,v 1.321 2014/04/16 18:55:19 maxv Exp $ */ +/* $NetBSD: lfs_vfsops.c,v 1.322 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007 @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.321 2014/04/16 18:55:19 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.322 2015/03/28 19:24:05 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_lfs.h" @@ -857,7 +857,7 @@ lfs_mountfs(struct vnode *devvp, struct sb_addr = LFS_LABELPAD / DEV_BSIZE; while (1) { /* Read in the superblock. */ - error = bread(devvp, sb_addr, LFS_SBPAD, cred, 0, &bp); + error = bread(devvp, sb_addr, LFS_SBPAD, 0, &bp); if (error) goto out; dfs = (struct dlfs *)bp->b_data; @@ -909,7 +909,7 @@ lfs_mountfs(struct vnode *devvp, struct dfs->dlfs_sboffs[1] - LFS_LABELPAD / fsbsize > LFS_SBPAD / fsbsize) { error = bread(devvp, dfs->dlfs_sboffs[1] * (fsbsize / DEV_BSIZE), - LFS_SBPAD, cred, 0, &abp); + LFS_SBPAD, 0, &abp); if (error) goto out; adfs = (struct dlfs *)abp->b_data; @@ -1531,7 +1531,7 @@ retry: again: error = bread(ump->um_devvp, LFS_FSBTODB(fs, daddr), (fs->lfs_version == 1 ? fs->lfs_bsize : fs->lfs_ibsize), - NOCRED, 0, &bp); + 0, &bp); if (error) { /* * The inode does not contain anything useful, so it would @@ -2198,7 +2198,7 @@ lfs_resize_fs(struct lfs *fs, int newnse rw_enter(&fs->lfs_iflock, RW_WRITER); for (i = 0; i < ilast; i++) { /* XXX what to do if bread fails? */ - bread(ivp, i, fs->lfs_bsize, NOCRED, 0, &bp); + bread(ivp, i, fs->lfs_bsize, 0, &bp); brelse(bp, 0); } @@ -2228,11 +2228,11 @@ lfs_resize_fs(struct lfs *fs, int newnse inc = -1; } for (i = start; i != end; i += inc) { - if (bread(ivp, i, fs->lfs_bsize, NOCRED, + if (bread(ivp, i, fs->lfs_bsize, B_MODIFY, &bp) != 0) panic("resize: bread dst blk failed"); if (bread(ivp, i - noff, fs->lfs_bsize, - NOCRED, 0, &obp)) + 0, &obp)) panic("resize: bread src blk failed"); memcpy(bp->b_data, obp->b_data, fs->lfs_bsize); VOP_BWRITE(bp->b_vp, bp); @@ -2245,7 +2245,7 @@ lfs_resize_fs(struct lfs *fs, int newnse for (i = oldnsegs; i < newnsegs; i++) { if ((error = bread(ivp, i / fs->lfs_sepb + fs->lfs_cleansz, fs->lfs_bsize, - NOCRED, B_MODIFY, &bp)) != 0) + B_MODIFY, &bp)) != 0) panic("lfs: ifile read: %d", error); while ((i + 1) % fs->lfs_sepb && i < newnsegs) { sup = &((SEGUSE *)bp->b_data)[i % fs->lfs_sepb]; @@ -2305,7 +2305,7 @@ lfs_resize_fs(struct lfs *fs, int newnse /* Update cleaner info so the cleaner can die */ /* XXX what to do if bread fails? */ - bread(ivp, 0, fs->lfs_bsize, NOCRED, B_MODIFY, &bp); + bread(ivp, 0, fs->lfs_bsize, B_MODIFY, &bp); ((CLEANERINFO *)bp->b_data)->clean = fs->lfs_nclean; ((CLEANERINFO *)bp->b_data)->dirty = fs->lfs_nseg - fs->lfs_nclean; VOP_BWRITE(bp->b_vp, bp); Index: src/sys/ufs/lfs/ulfs_quota2.c diff -u src/sys/ufs/lfs/ulfs_quota2.c:1.17 src/sys/ufs/lfs/ulfs_quota2.c:1.18 --- src/sys/ufs/lfs/ulfs_quota2.c:1.17 Mon Dec 8 00:16:44 2014 +++ src/sys/ufs/lfs/ulfs_quota2.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ulfs_quota2.c,v 1.17 2014/12/08 00:16:44 justin Exp $ */ +/* $NetBSD: ulfs_quota2.c,v 1.18 2015/03/28 19:24:05 maxv Exp $ */ /* from NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp */ /* from NetBSD: ffs_quota2.c,v 1.4 2011/06/12 03:36:00 rmind Exp */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.17 2014/12/08 00:16:44 justin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.18 2015/03/28 19:24:05 maxv Exp $"); #include <sys/buf.h> #include <sys/param.h> @@ -149,8 +149,7 @@ getq2h(struct ulfsmount *ump, int type, struct quota2_header *q2h; KASSERT(mutex_owned(&lfs_dqlock)); - error = bread(ump->um_quotas[type], 0, ump->umq2_bsize, - ump->um_cred[type], flags, &bp); + error = bread(ump->um_quotas[type], 0, ump->umq2_bsize, flags, &bp); if (error) return error; if (bp->b_resid != 0) @@ -176,8 +175,7 @@ getq2e(struct ulfsmount *ump, int type, panic("dq2get: %s quota file corrupted", lfs_quotatypes[type]); } - error = bread(ump->um_quotas[type], lblkno, ump->umq2_bsize, - ump->um_cred[type], flags, &bp); + error = bread(ump->um_quotas[type], lblkno, ump->umq2_bsize, flags, &bp); if (error) return error; if (bp->b_resid != 0) { @@ -218,8 +216,7 @@ quota2_walk_list(struct ulfsmount *ump, bp = obp; } else { ret = bread(ump->um_quotas[type], lblkno, - ump->umq2_bsize, - ump->um_cred[type], flags, &bp); + ump->umq2_bsize, flags, &bp); if (ret) return ret; if (bp->b_resid != 0) { Index: src/sys/ufs/lfs/ulfs_readwrite.c diff -u src/sys/ufs/lfs/ulfs_readwrite.c:1.14 src/sys/ufs/lfs/ulfs_readwrite.c:1.15 --- src/sys/ufs/lfs/ulfs_readwrite.c:1.14 Sat Mar 28 17:45:47 2015 +++ src/sys/ufs/lfs/ulfs_readwrite.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ulfs_readwrite.c,v 1.14 2015/03/28 17:45:47 riastradh Exp $ */ +/* $NetBSD: ulfs_readwrite.c,v 1.15 2015/03/28 19:24:05 maxv Exp $ */ /* from NetBSD: ufs_readwrite.c,v 1.105 2013/01/22 09:39:18 dholland Exp */ /*- @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.14 2015/03/28 17:45:47 riastradh Exp $"); +__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.15 2015/03/28 19:24:05 maxv Exp $"); #ifdef LFS_READWRITE #define FS struct lfs @@ -190,7 +190,7 @@ BUFRD(struct vnode *vp, struct uio *uio, bytesinfile); if (lfs_lblktosize(fs, nextlbn) >= ip->i_size) - error = bread(vp, lbn, size, NOCRED, 0, &bp); + error = bread(vp, lbn, size, 0, &bp); else { int nextsize = lfs_blksize(fs, ip, nextlbn); error = breadn(vp, lbn, Index: src/sys/ufs/ufs/ufs_quota2.c diff -u src/sys/ufs/ufs/ufs_quota2.c:1.39 src/sys/ufs/ufs/ufs_quota2.c:1.40 --- src/sys/ufs/ufs/ufs_quota2.c:1.39 Sat Jun 28 22:27:51 2014 +++ src/sys/ufs/ufs/ufs_quota2.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota2.c,v 1.39 2014/06/28 22:27:51 dholland Exp $ */ +/* $NetBSD: ufs_quota2.c,v 1.40 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 2010 Manuel Bouyer * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.39 2014/06/28 22:27:51 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.40 2015/03/28 19:24:05 maxv Exp $"); #include <sys/buf.h> #include <sys/param.h> @@ -146,7 +146,7 @@ getq2h(struct ufsmount *ump, int type, KASSERT(mutex_owned(&dqlock)); error = bread(ump->um_quotas[type], 0, ump->umq2_bsize, - ump->um_cred[type], flags, &bp); + flags, &bp); if (error) return error; if (bp->b_resid != 0) @@ -173,7 +173,7 @@ getq2e(struct ufsmount *ump, int type, d quotatypes[type]); } error = bread(ump->um_quotas[type], lblkno, ump->umq2_bsize, - ump->um_cred[type], flags, &bp); + flags, &bp); if (error) return error; if (bp->b_resid != 0) { @@ -213,8 +213,7 @@ quota2_walk_list(struct ufsmount *ump, s bp = obp; } else { ret = bread(ump->um_quotas[type], lblkno, - ump->umq2_bsize, - ump->um_cred[type], flags, &bp); + ump->umq2_bsize, flags, &bp); if (ret) return ret; if (bp->b_resid != 0) { Index: src/sys/ufs/ufs/ufs_readwrite.c diff -u src/sys/ufs/ufs/ufs_readwrite.c:1.114 src/sys/ufs/ufs/ufs_readwrite.c:1.115 --- src/sys/ufs/ufs/ufs_readwrite.c:1.114 Sat Mar 28 17:45:47 2015 +++ src/sys/ufs/ufs/ufs_readwrite.c Sat Mar 28 19:24:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_readwrite.c,v 1.114 2015/03/28 17:45:47 riastradh Exp $ */ +/* $NetBSD: ufs_readwrite.c,v 1.115 2015/03/28 19:24:05 maxv Exp $ */ /*- * Copyright (c) 1993 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.114 2015/03/28 17:45:47 riastradh Exp $"); +__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.115 2015/03/28 19:24:05 maxv Exp $"); #ifdef LFS_READWRITE #define FS struct lfs @@ -201,7 +201,7 @@ BUFRD(struct vnode *vp, struct uio *uio, bytesinfile); if (ufs_lblktosize(fs, nextlbn) >= ip->i_size) - error = bread(vp, lbn, size, NOCRED, 0, &bp); + error = bread(vp, lbn, size, 0, &bp); else { int nextsize = ufs_blksize(fs, ip, nextlbn); error = breadn(vp, lbn,