summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorchopps <chopps@NetBSD.org>2015-03-29 19:35:58 +0000
committerchopps <chopps@NetBSD.org>2015-03-29 19:35:58 +0000
commit4ec44e9dddcfd4b03077167bddbd6130a1e1e800 (patch)
treed0e6b1fd484a99049f41557415e4bc2f57974d35 /libexec
parent5ebee7f7739f484e8ac772fced1ca62ce16dfb3f (diff)
- Fix fallout for recent bread() change (removing cred arg).
Diffstat (limited to 'libexec')
-rw-r--r--libexec/lfs_cleanerd/coalesce.c6
-rw-r--r--libexec/lfs_cleanerd/lfs_cleanerd.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/libexec/lfs_cleanerd/coalesce.c b/libexec/lfs_cleanerd/coalesce.c
index d8dade4a59c..c0db960d83b 100644
--- a/libexec/lfs_cleanerd/coalesce.c
+++ b/libexec/lfs_cleanerd/coalesce.c
@@ -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);
diff --git a/libexec/lfs_cleanerd/lfs_cleanerd.c b/libexec/lfs_cleanerd/lfs_cleanerd.c
index b1d3cd6c9eb..3dd6ad20972 100644
--- a/libexec/lfs_cleanerd/lfs_cleanerd.c
+++ b/libexec/lfs_cleanerd/lfs_cleanerd.c
@@ -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, ino_t ino, struct ubuf **bpp)
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 daddr, BLOCK_INFO **bipp, int *bic)
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 *cip)
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, CLEANERINFO *cip)
* 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;
}