Module Name: src
Committed By: chopps
Date: Sun Mar 29 19:35:58 UTC 2015
Modified Files:
src/libexec/lfs_cleanerd: coalesce.c lfs_cleanerd.c
src/sbin/fsck_lfs: bufcache.c bufcache.h dir.c inode.c lfs.c pass6.c
segwrite.c setup.c
src/sbin/newfs_lfs: make_lfs.c
Log Message:
- Fix fallout for recent bread() change (removing cred arg).
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/libexec/lfs_cleanerd/coalesce.c
cvs rdiff -u -r1.37 -r1.38 src/libexec/lfs_cleanerd/lfs_cleanerd.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/fsck_lfs/bufcache.c
cvs rdiff -u -r1.11 -r1.12 src/sbin/fsck_lfs/bufcache.h
cvs rdiff -u -r1.32 -r1.33 src/sbin/fsck_lfs/dir.c src/sbin/fsck_lfs/pass6.c
cvs rdiff -u -r1.52 -r1.53 src/sbin/fsck_lfs/inode.c
cvs rdiff -u -r1.43 -r1.44 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.44 -r1.45 src/sbin/fsck_lfs/setup.c
cvs rdiff -u -r1.29 -r1.30 src/sbin/newfs_lfs/make_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/lfs_cleanerd/coalesce.c
diff -u src/libexec/lfs_cleanerd/coalesce.c:1.23 src/libexec/lfs_cleanerd/coalesce.c:1.24
--- src/libexec/lfs_cleanerd/coalesce.c:1.23 Tue Jun 18 18:18:57 2013
+++ src/libexec/lfs_cleanerd/coalesce.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: coalesce.c,v 1.23 2013/06/18 18:18:57 christos Exp $ */
+/* $NetBSD: coalesce.c,v 1.24 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 2002, 2005 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@ get_dinode(struct clfs *fs, ino_t ino)
if (daddr == 0x0)
return NULL;
- bread(fs->clfs_devvp, daddr, fs->lfs_ibsize, NOCRED, 0, &bp);
+ bread(fs->clfs_devvp, daddr, fs->lfs_ibsize, 0, &bp);
for (dip = (struct ulfs1_dinode *)bp->b_data;
dip < (struct ulfs1_dinode *)(bp->b_data + fs->lfs_ibsize); dip++)
if (dip->di_inumber == ino) {
@@ -297,7 +297,7 @@ clean_inode(struct clfs *fs, ino_t ino)
bps = lfs_segtod(fs, 1);
for (tbip = bip; tbip < bip + nb; tbip += bps) {
do {
- bread(fs->lfs_ivnode, 0, fs->lfs_bsize, NOCRED, 0, &bp);
+ bread(fs->lfs_ivnode, 0, fs->lfs_bsize, 0, &bp);
cip = *(CLEANERINFO *)bp->b_data;
brelse(bp, B_INVAL);
Index: src/libexec/lfs_cleanerd/lfs_cleanerd.c
diff -u src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.37 src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.38
--- src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.37 Sat Oct 19 17:19:30 2013
+++ src/libexec/lfs_cleanerd/lfs_cleanerd.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.37 2013/10/19 17:19:30 christos Exp $ */
+/* $NetBSD: lfs_cleanerd.c,v 1.38 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -331,7 +331,7 @@ lfs_ientry(IFILE **ifpp, struct clfs *fs
int error;
error = bread(fs->lfs_ivnode, ino / fs->lfs_ifpb + fs->lfs_cleansz +
- fs->lfs_segtabsz, fs->lfs_bsize, NOCRED, 0, bpp);
+ fs->lfs_segtabsz, fs->lfs_bsize, 0, bpp);
if (error)
syslog(LOG_ERR, "%s: ientry failed for ino %d",
fs->lfs_fsmnt, (int)ino);
@@ -514,7 +514,7 @@ parse_pseg(struct clfs *fs, daddr_t dadd
syslog(LOG_WARNING, "fixing short FINFO at %x (seg %d)",
odaddr, lfs_dtosn(fs, odaddr));
bread(fs->clfs_devvp, odaddr, fs->lfs_fsize,
- NOCRED, 0, &nbp);
+ 0, &nbp);
nssp = (SEGSUM *)nbp->b_data;
--nssp->ss_nfinfo;
nssp->ss_sumsum = cksum(&nssp->ss_datasum,
@@ -1014,7 +1014,7 @@ clean_fs(struct clfs *fs, CLEANERINFO *c
npos = 0;
for (i = 0; i < fs->lfs_nseg; i+= fs->lfs_sepb) {
bread(fs->lfs_ivnode, fs->lfs_cleansz + i / fs->lfs_sepb,
- fs->lfs_bsize, NOCRED, 0, &bp);
+ fs->lfs_bsize, 0, &bp);
for (j = 0; j < fs->lfs_sepb && i + j < fs->lfs_nseg; j++) {
sup = ((SEGUSE *)bp->b_data) + j;
fs->clfs_segtab[i + j].nbytes = sup->su_nbytes;
@@ -1214,7 +1214,7 @@ needs_cleaning(struct clfs *fs, CLEANERI
* the cached information, so invalidate the buffer before
* handing it back.
*/
- if (bread(fs->lfs_ivnode, 0, fs->lfs_bsize, NOCRED, 0, &bp)) {
+ if (bread(fs->lfs_ivnode, 0, fs->lfs_bsize, 0, &bp)) {
syslog(LOG_ERR, "%s: can't read inode", fs->lfs_fsmnt);
return -1;
}
Index: src/sbin/fsck_lfs/bufcache.c
diff -u src/sbin/fsck_lfs/bufcache.c:1.14 src/sbin/fsck_lfs/bufcache.c:1.15
--- src/sbin/fsck_lfs/bufcache.c:1.14 Sat Oct 19 01:09:58 2013
+++ src/sbin/fsck_lfs/bufcache.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.c,v 1.14 2013/10/19 01:09:58 christos Exp $ */
+/* $NetBSD: bufcache.c,v 1.15 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -339,8 +339,7 @@ brelse(struct ubuf * bp, int set)
/* Read the given block from disk, return it B_BUSY. */
int
-bread(struct uvnode * vp, daddr_t lbn, int size, void * unused,
- int flags, struct ubuf ** bpp)
+bread(struct uvnode * vp, daddr_t lbn, int size, int flags, struct ubuf ** bpp)
{
struct ubuf *bp;
daddr_t daddr;
Index: src/sbin/fsck_lfs/bufcache.h
diff -u src/sbin/fsck_lfs/bufcache.h:1.11 src/sbin/fsck_lfs/bufcache.h:1.12
--- src/sbin/fsck_lfs/bufcache.h:1.11 Fri May 16 09:21:59 2008
+++ src/sbin/fsck_lfs/bufcache.h Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.h,v 1.11 2008/05/16 09:21:59 hannken Exp $ */
+/* $NetBSD: bufcache.h,v 1.12 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -120,6 +120,6 @@ struct ubuf *incore(struct uvnode *, int
struct ubuf *getblk(struct uvnode *, daddr_t, int);
void bwrite(struct ubuf *);
void brelse(struct ubuf *, int);
-int bread(struct uvnode *, daddr_t, int, void *, int, struct ubuf **);
+int bread(struct uvnode *, daddr_t, int, int, struct ubuf **);
void reassignbuf(struct ubuf *, struct uvnode *);
void dump_free_lists(void);
Index: src/sbin/fsck_lfs/dir.c
diff -u src/sbin/fsck_lfs/dir.c:1.32 src/sbin/fsck_lfs/dir.c:1.33
--- src/sbin/fsck_lfs/dir.c:1.32 Tue Jun 18 18:18:58 2013
+++ src/sbin/fsck_lfs/dir.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.32 2013/06/18 18:18:58 christos Exp $ */
+/* $NetBSD: dir.c,v 1.33 2015/03/29 19:35:58 chopps Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -155,7 +155,7 @@ dirscan(struct inodesc *idesc)
memcpy(dbuf, dp, (size_t) dsize);
idesc->id_dirp = (struct lfs_direct *) dbuf;
if ((n = (*idesc->id_func) (idesc)) & ALTERED) {
- bread(vp, idesc->id_lblkno, blksiz, NOCRED, 0, &bp);
+ bread(vp, idesc->id_lblkno, blksiz, 0, &bp);
memcpy(bp->b_data + idesc->id_loc - dsize, dbuf,
(size_t) dsize);
VOP_BWRITE(bp);
@@ -178,7 +178,7 @@ fsck_readdir(struct uvnode *vp, struct i
long size, blksiz, fix, dploc;
blksiz = idesc->id_numfrags * fs->lfs_fsize;
- bread(vp, idesc->id_lblkno, blksiz, NOCRED, 0, &bp);
+ bread(vp, idesc->id_lblkno, blksiz, 0, &bp);
if (idesc->id_loc % LFS_DIRBLKSIZ == 0 && idesc->id_filesize > 0 &&
idesc->id_loc < blksiz) {
dp = (struct lfs_direct *) (bp->b_data + idesc->id_loc);
@@ -188,7 +188,7 @@ fsck_readdir(struct uvnode *vp, struct i
if (idesc->id_fix == IGNORE)
return (0);
fix = dofix(idesc, "DIRECTORY CORRUPTED");
- bread(vp, idesc->id_lblkno, blksiz, NOCRED, 0, &bp);
+ bread(vp, idesc->id_lblkno, blksiz, 0, &bp);
dp = (struct lfs_direct *) (bp->b_data + idesc->id_loc);
dp->d_reclen = LFS_DIRBLKSIZ;
dp->d_ino = 0;
@@ -226,7 +226,7 @@ dpok:
if (idesc->id_fix == IGNORE)
return 0;
fix = dofix(idesc, "DIRECTORY CORRUPTED");
- bread(vp, idesc->id_lblkno, blksiz, NOCRED, 0, &bp);
+ bread(vp, idesc->id_lblkno, blksiz, 0, &bp);
dp = (struct lfs_direct *) (bp->b_data + dploc);
dp->d_reclen += size;
if (fix)
@@ -573,11 +573,11 @@ expanddir(struct uvnode *vp, struct ulfs
dp->di_size += fs->lfs_bsize;
dp->di_blocks += lfs_btofsb(fs, fs->lfs_bsize);
bread(vp, dp->di_db[lastbn + 1],
- (long) lfs_dblksize(fs, dp, lastbn + 1), NOCRED, 0, &bp);
+ (long) lfs_dblksize(fs, dp, lastbn + 1), 0, &bp);
if (bp->b_flags & B_ERROR)
goto bad;
memcpy(firstblk, bp->b_data, LFS_DIRBLKSIZ);
- bread(vp, lastbn, fs->lfs_bsize, NOCRED, 0, &bp);
+ bread(vp, lastbn, fs->lfs_bsize, 0, &bp);
if (bp->b_flags & B_ERROR)
goto bad;
memcpy(bp->b_data, firstblk, LFS_DIRBLKSIZ);
@@ -587,7 +587,7 @@ expanddir(struct uvnode *vp, struct ulfs
memcpy(cp, &emptydir, sizeof emptydir);
VOP_BWRITE(bp);
bread(vp, dp->di_db[lastbn + 1],
- (long) lfs_dblksize(fs, dp, lastbn + 1), NOCRED, 0, &bp);
+ (long) lfs_dblksize(fs, dp, lastbn + 1), 0, &bp);
if (bp->b_flags & B_ERROR)
goto bad;
memcpy(bp->b_data, &emptydir, sizeof emptydir);
@@ -626,7 +626,7 @@ allocdir(ino_t parent, ino_t request, in
dirp->dotdot_ino = parent;
vp = vget(fs, ino);
dp = VTOD(vp);
- bread(vp, dp->di_db[0], fs->lfs_fsize, NOCRED, 0, &bp);
+ bread(vp, dp->di_db[0], fs->lfs_fsize, 0, &bp);
if (bp->b_flags & B_ERROR) {
brelse(bp, 0);
freeino(ino);
Index: src/sbin/fsck_lfs/pass6.c
diff -u src/sbin/fsck_lfs/pass6.c:1.32 src/sbin/fsck_lfs/pass6.c:1.33
--- src/sbin/fsck_lfs/pass6.c:1.32 Sat Oct 19 01:09:58 2013
+++ src/sbin/fsck_lfs/pass6.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pass6.c,v 1.32 2013/10/19 01:09:58 christos Exp $ */
+/* $NetBSD: pass6.c,v 1.33 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -120,7 +120,7 @@ rfw_update_single(struct uvnode *vp, dad
break;
default:
ap = &a[num - 1];
- if (bread(vp, ap->in_lbn, fs->lfs_bsize, NULL, 0, &bp))
+ if (bread(vp, ap->in_lbn, fs->lfs_bsize, 0, &bp))
errx(1, "lfs_updatemeta: bread bno %" PRId64,
ap->in_lbn);
@@ -336,14 +336,14 @@ account_indir(struct uvnode *vp, struct
lbn = -ilbn;
else
lbn = ilbn + 1;
- bread(fs->lfs_devvp, LFS_FSBTODB(fs, daddr), fs->lfs_bsize, NULL, 0, &bp);
+ bread(fs->lfs_devvp, LFS_FSBTODB(fs, daddr), fs->lfs_bsize, 0, &bp);
buf = emalloc(fs->lfs_bsize);
memcpy(buf, bp->b_data, fs->lfs_bsize);
brelse(bp, 0);
obuf = emalloc(fs->lfs_bsize);
if (vp) {
- bread(vp, ilbn, fs->lfs_bsize, NULL, 0, &bp);
+ bread(vp, ilbn, fs->lfs_bsize, 0, &bp);
memcpy(obuf, bp->b_data, fs->lfs_bsize);
brelse(bp, 0);
} else
@@ -611,7 +611,7 @@ pass6(void)
}
/* Read in summary block */
- bread(devvp, LFS_FSBTODB(fs, daddr), fs->lfs_sumsize, NULL, 0, &bp);
+ bread(devvp, LFS_FSBTODB(fs, daddr), fs->lfs_sumsize, 0, &bp);
sp = (SEGSUM *)bp->b_data;
if (debug)
pwarn("sum at 0x%x: ninos=%d nfinfo=%d\n",
@@ -650,7 +650,7 @@ pass6(void)
fs->lfs_bfree -= lfs_btofsb(fs, fs->lfs_ibsize);
sbdirty();
bread(devvp, LFS_FSBTODB(fs, ibdaddr), fs->lfs_ibsize,
- NOCRED, 0, &ibp);
+ 0, &ibp);
memcpy(ibbuf, ibp->b_data, fs->lfs_ibsize);
brelse(ibp, 0);
@@ -837,7 +837,7 @@ pass6(void)
}
/* Read in summary block */
- bread(devvp, LFS_FSBTODB(fs, daddr), fs->lfs_sumsize, NULL, 0, &bp);
+ bread(devvp, LFS_FSBTODB(fs, daddr), fs->lfs_sumsize, 0, &bp);
sp = (SEGSUM *)bp->b_data;
bc = check_summary(fs, sp, daddr, debug, devvp, pass6harvest);
if (bc == 0) {
Index: src/sbin/fsck_lfs/inode.c
diff -u src/sbin/fsck_lfs/inode.c:1.52 src/sbin/fsck_lfs/inode.c:1.53
--- src/sbin/fsck_lfs/inode.c:1.52 Sun Mar 23 05:39:32 2014
+++ src/sbin/fsck_lfs/inode.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.52 2014/03/23 05:39:32 dholland Exp $ */
+/* $NetBSD: inode.c,v 1.53 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -246,7 +246,7 @@ iblock(struct inodesc *idesc, long ileve
devvp = fs->lfs_devvp;
bread(devvp, LFS_FSBTODB(fs, idesc->id_blkno), fs->lfs_bsize,
- NOCRED, 0, &bp);
+ 0, &bp);
ilevel--;
for (sizepb = fs->lfs_bsize, i = 0; i < ilevel; i++)
sizepb *= LFS_NINDIR(fs);
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.43 src/sbin/fsck_lfs/lfs.c:1.44
--- src/sbin/fsck_lfs/lfs.c:1.43 Sun Jul 13 02:44:21 2014
+++ src/sbin/fsck_lfs/lfs.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.43 2014/07/13 02:44:21 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.44 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -367,7 +367,7 @@ lfs_raw_vget(struct lfs * fs, ino_t ino,
/* Load inode block and find inode */
if (daddr > 0) {
bread(fs->lfs_devvp, LFS_FSBTODB(fs, daddr), fs->lfs_ibsize,
- NULL, 0, &bp);
+ 0, &bp);
bp->b_flags |= B_AGE;
dip = lfs_ifind(fs, ino, bp);
if (dip == NULL) {
@@ -479,7 +479,7 @@ lfs_init(int devfd, daddr_t sblkno, dadd
dev_bsize = DEV_BSIZE;
- (void)bread(devvp, sblkno, LFS_SBPAD, NOCRED, 0, &bp);
+ (void)bread(devvp, sblkno, LFS_SBPAD, 0, &bp);
fs = ecalloc(1, sizeof(*fs));
fs->lfs_dlfs = *((struct dlfs *) bp->b_data);
fs->lfs_devvp = devvp;
@@ -490,7 +490,7 @@ lfs_init(int devfd, daddr_t sblkno, dadd
if (tryalt) {
(void)bread(devvp, LFS_FSBTODB(fs, fs->lfs_sboffs[1]),
- LFS_SBPAD, NOCRED, 0, &bp);
+ LFS_SBPAD, 0, &bp);
altfs = ecalloc(1, sizeof(*altfs));
altfs->lfs_dlfs = *((struct dlfs *) bp->b_data);
altfs->lfs_devvp = devvp;
@@ -598,7 +598,7 @@ try_verify(struct lfs *osb, struct uvnod
/* Read in summary block */
bread(devvp, LFS_FSBTODB(osb, daddr), osb->lfs_sumsize,
- NULL, 0, &bp);
+ 0, &bp);
sp = (SEGSUM *)bp->b_data;
/*
@@ -790,7 +790,7 @@ check_summary(struct lfs *fs, SEGSUM *sp
}
while (j < howmany(sp->ss_ninos, LFS_INOPB(fs)) && *idp == daddr) {
bread(devvp, LFS_FSBTODB(fs, daddr), fs->lfs_ibsize,
- NOCRED, 0, &bp);
+ 0, &bp);
datap[datac++] = ((u_int32_t *) (bp->b_data))[0];
brelse(bp, 0);
@@ -806,7 +806,7 @@ check_summary(struct lfs *fs, SEGSUM *sp
fp->fi_lastlength
: fs->lfs_bsize);
bread(devvp, LFS_FSBTODB(fs, daddr), len,
- NOCRED, 0, &bp);
+ 0, &bp);
datap[datac++] = ((u_int32_t *) (bp->b_data))[0];
brelse(bp, 0);
daddr += lfs_btofsb(fs, len);
@@ -1043,7 +1043,7 @@ lfs_balloc(struct uvnode *vp, off_t star
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 */
@@ -1149,8 +1149,7 @@ lfs_balloc(struct uvnode *vp, off_t star
break;
default:
idp = &indirs[num - 1];
- if (bread(vp, idp->in_lbn, fs->lfs_bsize, NOCRED,
- 0, &ibp))
+ if (bread(vp, idp->in_lbn, fs->lfs_bsize, 0, &ibp))
panic("lfs_balloc: bread bno %lld",
(long long)idp->in_lbn);
/* XXX ondisk32 */
@@ -1200,7 +1199,7 @@ lfs_fragextend(struct uvnode *vp, int os
* 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))) {
brelse(*bpp, 0);
goto out;
}
Index: src/sbin/fsck_lfs/segwrite.c
diff -u src/sbin/fsck_lfs/segwrite.c:1.27 src/sbin/fsck_lfs/segwrite.c:1.28
--- src/sbin/fsck_lfs/segwrite.c:1.27 Sat Oct 19 01:09:58 2013
+++ src/sbin/fsck_lfs/segwrite.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.27 2013/10/19 01:09:58 christos Exp $ */
+/* $NetBSD: segwrite.c,v 1.28 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -472,7 +472,7 @@ lfs_update_single(struct lfs * fs, struc
break;
default:
ap = &a[num - 1];
- if (bread(vp, ap->in_lbn, fs->lfs_bsize, NULL, 0, &bp))
+ if (bread(vp, ap->in_lbn, fs->lfs_bsize, 0, &bp))
errx(1, "lfs_updatemeta: bread bno %" PRId64,
ap->in_lbn);
Index: src/sbin/fsck_lfs/setup.c
diff -u src/sbin/fsck_lfs/setup.c:1.44 src/sbin/fsck_lfs/setup.c:1.45
--- src/sbin/fsck_lfs/setup.c:1.44 Tue Jun 18 18:18:58 2013
+++ src/sbin/fsck_lfs/setup.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.44 2013/06/18 18:18:58 christos Exp $ */
+/* $NetBSD: setup.c,v 1.45 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -256,7 +256,7 @@ setup(const char *dev)
while (tdaddr < idaddr) {
bread(fs->lfs_devvp, LFS_FSBTODB(fs, tdaddr),
fs->lfs_sumsize,
- NULL, 0, &bp);
+ 0, &bp);
sp = (SEGSUM *)bp->b_data;
if (sp->ss_sumsum != cksum(&sp->ss_datasum,
fs->lfs_sumsize -
@@ -411,7 +411,7 @@ setup(const char *dev)
if (debug)
pwarn("maxino = %llu\n", (unsigned long long)maxino);
for (i = 0; i < VTOI(ivp)->i_ffs1_size; i += fs->lfs_bsize) {
- bread(ivp, i >> fs->lfs_bshift, fs->lfs_bsize, NOCRED, 0, &bp);
+ bread(ivp, i >> fs->lfs_bshift, fs->lfs_bsize, 0, &bp);
/* XXX check B_ERROR */
brelse(bp, 0);
}
Index: src/sbin/newfs_lfs/make_lfs.c
diff -u src/sbin/newfs_lfs/make_lfs.c:1.29 src/sbin/newfs_lfs/make_lfs.c:1.30
--- src/sbin/newfs_lfs/make_lfs.c:1.29 Sat Oct 19 01:09:59 2013
+++ src/sbin/newfs_lfs/make_lfs.c Sun Mar 29 19:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: make_lfs.c,v 1.29 2013/10/19 01:09:59 christos Exp $ */
+/* $NetBSD: make_lfs.c,v 1.30 2015/03/29 19:35:58 chopps Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: make_lfs.c,v 1.29 2013/10/19 01:09:59 christos Exp $");
+__RCSID("$NetBSD: make_lfs.c,v 1.30 2015/03/29 19:35:58 chopps Exp $");
#endif
#endif /* not lint */
@@ -689,7 +689,7 @@ make_lfs(int devfd, uint secsize, struct
if (LFS_DIRBLKSIZ < fs->lfs_bsize)
VTOI(vp)->i_lfs_fragsize[i - 1] =
roundup(LFS_DIRBLKSIZ,fs->lfs_fsize);
- bread(vp, 0, fs->lfs_fsize, NOCRED, 0, &bp);
+ bread(vp, 0, fs->lfs_fsize, 0, &bp);
make_dir(bp->b_data, lfs_root_dir,
sizeof(lfs_root_dir) / sizeof(struct lfs_direct));
VOP_BWRITE(bp);
@@ -709,7 +709,7 @@ make_lfs(int devfd, uint secsize, struct
if (DIRBLKSIZ < fs->lfs_bsize)
VTOI(vp)->i_lfs_fragsize[i - 1] =
roundup(DIRBLKSIZ,fs->lfs_fsize);
- bread(vp, 0, fs->lfs_fsize, NOCRED, 0, &bp);
+ bread(vp, 0, fs->lfs_fsize, 0, &bp);
make_dir(bp->b_data, lfs_lf_dir,
sizeof(lfs_lf_dir) / sizeof(struct lfs_direct));
VOP_BWRITE(bp);
