Module Name: src
Committed By: dholland
Date: Sun Jun 23 22:03:34 UTC 2013
Modified Files:
src/sbin/fsck_ffs: inode.c pass4.c pass5.c utilities.c
src/sbin/newfs: mkfs.c
src/sbin/resize_ffs: resize_ffs.c
src/sbin/scan_ffs: scan_ffs.c
src/sys/ufs/ffs: ffs_alloc.c ffs_snapshot.c ffs_vfsops.c ffs_wapbl.c
fs.h
src/usr.sbin/makefs/ffs: ffs_alloc.c mkfs.c
Log Message:
Stick ffs_ in front of the following macros:
fragstoblks()
blkstofrags()
fragnum()
blknum()
to finish the job of distinguishing them from the lfs versions, which
Christos renamed the other day.
I believe this is the last of the overtly ambiguous exported symbols
from ffs... or at least, the last of the ones that conflicted with lfs.
ffs still pollutes the C namespace very broadly (as does ufs) and this
needs quite a bit more cleanup.
XXX: boo on macros with lowercase names. But I'm not tackling that just yet.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sbin/fsck_ffs/inode.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/fsck_ffs/pass4.c
cvs rdiff -u -r1.53 -r1.54 src/sbin/fsck_ffs/pass5.c
cvs rdiff -u -r1.62 -r1.63 src/sbin/fsck_ffs/utilities.c
cvs rdiff -u -r1.119 -r1.120 src/sbin/newfs/mkfs.c
cvs rdiff -u -r1.37 -r1.38 src/sbin/resize_ffs/resize_ffs.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/scan_ffs/scan_ffs.c
cvs rdiff -u -r1.137 -r1.138 src/sys/ufs/ffs/ffs_alloc.c
cvs rdiff -u -r1.126 -r1.127 src/sys/ufs/ffs/ffs_snapshot.c
cvs rdiff -u -r1.285 -r1.286 src/sys/ufs/ffs/ffs_vfsops.c
cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/ffs/ffs_wapbl.c
cvs rdiff -u -r1.63 -r1.64 src/sys/ufs/ffs/fs.h
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/makefs/ffs/ffs_alloc.c
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/makefs/ffs/mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/inode.c
diff -u src/sbin/fsck_ffs/inode.c:1.68 src/sbin/fsck_ffs/inode.c:1.69
--- src/sbin/fsck_ffs/inode.c:1.68 Sun Jun 23 07:28:36 2013
+++ src/sbin/fsck_ffs/inode.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.68 2013/06/23 07:28:36 dholland Exp $ */
+/* $NetBSD: inode.c,v 1.69 2013/06/23 22:03:34 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: inode.c,v 1.68 2013/06/23 07:28:36 dholland Exp $");
+__RCSID("$NetBSD: inode.c,v 1.69 2013/06/23 22:03:34 dholland Exp $");
#endif
#endif /* not lint */
@@ -281,10 +281,10 @@ chkrange(daddr_t blk, int cnt)
cnt - 1 > maxfsblock - blk)
return (1);
if (cnt > sblock->fs_frag ||
- fragnum(sblock, blk) + cnt > sblock->fs_frag) {
+ ffs_fragnum(sblock, blk) + cnt > sblock->fs_frag) {
if (debug)
printf("bad size: blk %lld, offset %d, size %d\n",
- (long long)blk, (int)fragnum(sblock, blk), cnt);
+ (long long)blk, (int)ffs_fragnum(sblock, blk), cnt);
}
c = dtog(sblock, blk);
if (blk < cgdmin(sblock, c)) {
Index: src/sbin/fsck_ffs/pass4.c
diff -u src/sbin/fsck_ffs/pass4.c:1.27 src/sbin/fsck_ffs/pass4.c:1.28
--- src/sbin/fsck_ffs/pass4.c:1.27 Tue Jan 22 09:39:12 2013
+++ src/sbin/fsck_ffs/pass4.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass4.c,v 1.27 2013/01/22 09:39:12 dholland Exp $ */
+/* $NetBSD: pass4.c,v 1.28 2013/06/23 22:03:34 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pass4.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: pass4.c,v 1.27 2013/01/22 09:39:12 dholland Exp $");
+__RCSID("$NetBSD: pass4.c,v 1.28 2013/06/23 22:03:34 dholland Exp $");
#endif
#endif /* not lint */
@@ -211,7 +211,7 @@ pass4check(struct inodesc *idesc)
sblock->fs_cstotal.cs_nbfree++;
sblock->fs_cs(fs, cg).cs_nbfree++;
ffs_clusteracct(sblock, cgp,
- fragstoblks(sblock, dtogd(sblock, idesc->id_blkno)), 1);
+ ffs_fragstoblks(sblock, dtogd(sblock, idesc->id_blkno)), 1);
}
sbdirty();
cgdirty();
Index: src/sbin/fsck_ffs/pass5.c
diff -u src/sbin/fsck_ffs/pass5.c:1.53 src/sbin/fsck_ffs/pass5.c:1.54
--- src/sbin/fsck_ffs/pass5.c:1.53 Sun Jun 23 07:28:36 2013
+++ src/sbin/fsck_ffs/pass5.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass5.c,v 1.53 2013/06/23 07:28:36 dholland Exp $ */
+/* $NetBSD: pass5.c,v 1.54 2013/06/23 22:03:34 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: pass5.c,v 1.53 2013/06/23 07:28:36 dholland Exp $");
+__RCSID("$NetBSD: pass5.c,v 1.54 2013/06/23 22:03:34 dholland Exp $");
#endif
#endif /* not lint */
@@ -160,7 +160,7 @@ pass5(void)
newcg->cg_clusteroff = newcg->cg_clustersumoff +
(fs->fs_contigsumsize + 1) * sizeof(u_int32_t);
newcg->cg_nextfreeoff = newcg->cg_clusteroff +
- howmany(fragstoblks(fs, fs->fs_fpg), CHAR_BIT);
+ howmany(ffs_fragstoblks(fs, fs->fs_fpg), CHAR_BIT);
}
newcg->cg_magic = CG_MAGIC;
mapsize = newcg->cg_nextfreeoff - newcg->cg_iusedoff;
@@ -195,7 +195,7 @@ pass5(void)
idesc[i].id_fix = FIX;
}
memset(&cstotal, 0, sizeof(struct csum_total));
- dmax = blknum(fs, fs->fs_size + fs->fs_frag - 1);
+ dmax = ffs_blknum(fs, fs->fs_size + fs->fs_frag - 1);
for (d = fs->fs_size; d < dmax; d++)
setbmap(d);
for (c = 0; c < fs->fs_ncg; c++) {
@@ -360,7 +360,7 @@ pass5(void)
}
if (fs->fs_contigsumsize > 0)
setbit(cg_clustersfree(newcg, 0),
- fragstoblks(fs, i));
+ ffs_fragstoblks(fs, i));
} else if (frags > 0) {
newcg->cg_cs.cs_nffree += frags;
blk = blkmap(fs, cg_blksfree(newcg, 0), i);
Index: src/sbin/fsck_ffs/utilities.c
diff -u src/sbin/fsck_ffs/utilities.c:1.62 src/sbin/fsck_ffs/utilities.c:1.63
--- src/sbin/fsck_ffs/utilities.c:1.62 Sun Jun 23 02:06:04 2013
+++ src/sbin/fsck_ffs/utilities.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: utilities.c,v 1.62 2013/06/23 02:06:04 dholland Exp $ */
+/* $NetBSD: utilities.c,v 1.63 2013/06/23 22:03:34 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95";
#else
-__RCSID("$NetBSD: utilities.c,v 1.62 2013/06/23 02:06:04 dholland Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.63 2013/06/23 22:03:34 dholland Exp $");
#endif
#endif /* not lint */
@@ -429,7 +429,7 @@ allocblk(long frags)
sblock->fs_cstotal.cs_nbfree--;
sblock->fs_cs(fs, cg).cs_nbfree--;
ffs_clusteracct(sblock, cgp,
- fragstoblks(sblock, baseblk), -1);
+ ffs_fragstoblks(sblock, baseblk), -1);
} else {
cgp->cg_cs.cs_nffree -= frags;
sblock->fs_cstotal.cs_nffree -= frags;
Index: src/sbin/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.119 src/sbin/newfs/mkfs.c:1.120
--- src/sbin/newfs/mkfs.c:1.119 Sun Jun 23 07:28:36 2013
+++ src/sbin/newfs/mkfs.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.119 2013/06/23 07:28:36 dholland Exp $ */
+/* $NetBSD: mkfs.c,v 1.120 2013/06/23 22:03:34 dholland Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
#if 0
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: mkfs.c,v 1.119 2013/06/23 07:28:36 dholland Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.120 2013/06/23 22:03:34 dholland Exp $");
#endif
#endif /* not lint */
@@ -508,12 +508,12 @@ mkfs(const char *fsys, int fi, int fo,
sblock.fs_dsize = sblock.fs_size - sblock.fs_sblkno -
sblock.fs_ncg * (sblock.fs_dblkno - sblock.fs_sblkno);
sblock.fs_cstotal.cs_nbfree =
- fragstoblks(&sblock, sblock.fs_dsize) -
+ ffs_fragstoblks(&sblock, sblock.fs_dsize) -
howmany(csfrags, sblock.fs_frag);
sblock.fs_cstotal.cs_nffree =
- fragnum(&sblock, sblock.fs_size) +
- (fragnum(&sblock, csfrags) > 0 ?
- sblock.fs_frag - fragnum(&sblock, csfrags) : 0);
+ ffs_fragnum(&sblock, sblock.fs_size) +
+ (ffs_fragnum(&sblock, csfrags) > 0 ?
+ sblock.fs_frag - ffs_fragnum(&sblock, csfrags) : 0);
sblock.fs_cstotal.cs_nifree = sblock.fs_ncg * sblock.fs_ipg - UFS_ROOTINO;
sblock.fs_cstotal.cs_ndir = 0;
sblock.fs_dsize -= csfrags;
@@ -828,7 +828,7 @@ initcg(int cylno, const struct timeval *
acg.cg_clusteroff = acg.cg_clustersumoff +
(sblock.fs_contigsumsize + 1) * sizeof(int32_t);
acg.cg_nextfreeoff = acg.cg_clusteroff +
- howmany(fragstoblks(&sblock, sblock.fs_fpg), CHAR_BIT);
+ howmany(ffs_fragstoblks(&sblock, sblock.fs_fpg), CHAR_BIT);
}
if (acg.cg_nextfreeoff > sblock.fs_cgsize) {
printf("Panic: cylinder group too big\n");
@@ -1298,7 +1298,7 @@ alloc(int size, int mode)
printf("internal error: can't find block in cyl 0\n");
return (0);
goth:
- blkno = fragstoblks(&sblock, d);
+ blkno = ffs_fragstoblks(&sblock, d);
clrblock(&sblock, cg_blksfree(&acg, 0), blkno);
if (sblock.fs_contigsumsize > 0)
clrbit(cg_clustersfree(&acg, 0), blkno);
Index: src/sbin/resize_ffs/resize_ffs.c
diff -u src/sbin/resize_ffs/resize_ffs.c:1.37 src/sbin/resize_ffs/resize_ffs.c:1.38
--- src/sbin/resize_ffs/resize_ffs.c:1.37 Sun Jun 23 07:28:36 2013
+++ src/sbin/resize_ffs/resize_ffs.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: resize_ffs.c,v 1.37 2013/06/23 07:28:36 dholland Exp $ */
+/* $NetBSD: resize_ffs.c,v 1.38 2013/06/23 22:03:34 dholland Exp $ */
/* From sources sent on February 17, 2003 */
/*-
* As its sole author, I explicitly place this code in the public
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: resize_ffs.c,v 1.37 2013/06/23 07:28:36 dholland Exp $");
+__RCSID("$NetBSD: resize_ffs.c,v 1.38 2013/06/23 22:03:34 dholland Exp $");
#include <sys/disk.h>
#include <sys/disklabel.h>
@@ -527,7 +527,7 @@ initcg(int cgn)
cg->cg_clusteroff = cg->cg_clustersumoff +
((newsb->fs_contigsumsize + 1) * sizeof(int32_t));
cg->cg_nextfreeoff = cg->cg_clusteroff +
- howmany(fragstoblks(newsb,newsb->fs_fpg), NBBY);
+ howmany(ffs_fragstoblks(newsb,newsb->fs_fpg), NBBY);
n = dlow / newsb->fs_frag;
if (n > 0) {
set_bits(cg_clustersfree(cg, 0), 0, n);
@@ -706,7 +706,7 @@ find_freeblock(void)
fwc = dtogd(newsb, hand);
secondpass = (hand == 0);
bits = cg_blksfree(cgs[cgn], 0);
- cgsize = blknum(newsb, cgs[cgn]->cg_ndblk);
+ cgsize = ffs_blknum(newsb, cgs[cgn]->cg_ndblk);
while (1) {
if (blk_is_set(bits, fwc, newsb->fs_frag))
return (hand);
@@ -723,7 +723,7 @@ find_freeblock(void)
cgn = 0;
}
bits = cg_blksfree(cgs[cgn], 0);
- cgsize = blknum(newsb, cgs[cgn]->cg_ndblk);
+ cgsize = ffs_blknum(newsb, cgs[cgn]->cg_ndblk);
}
}
}
Index: src/sbin/scan_ffs/scan_ffs.c
diff -u src/sbin/scan_ffs/scan_ffs.c:1.24 src/sbin/scan_ffs/scan_ffs.c:1.25
--- src/sbin/scan_ffs/scan_ffs.c:1.24 Sun Jun 23 07:28:36 2013
+++ src/sbin/scan_ffs/scan_ffs.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scan_ffs.c,v 1.24 2013/06/23 07:28:36 dholland Exp $ */
+/* $NetBSD: scan_ffs.c,v 1.25 2013/06/23 22:03:34 dholland Exp $ */
/*
* Copyright (c) 2005-2007 Juan Romero Pardines
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: scan_ffs.c,v 1.24 2013/06/23 07:28:36 dholland Exp $");
+__RCSID("$NetBSD: scan_ffs.c,v 1.25 2013/06/23 22:03:34 dholland Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -44,25 +44,12 @@ __RCSID("$NetBSD: scan_ffs.c,v 1.24 2013
#include <sys/fcntl.h>
#include <sys/mount.h>
-#include <ufs/ufs/dinode.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
-/* Undefine macros defined by both lfs/lfs.h and ffs/fs.h */
-#undef fragstoblks
-#undef blkstofrags
-#undef fragnum
-#undef blknum
-
+#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-/* Undefine macros defined by both lfs/lfs.h and ffs/fs.h */
-/* ...to make sure we don't later depend on their (ambigious) definition */
-#undef fragstoblks
-#undef blkstofrags
-#undef fragnum
-#undef blknum
-
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
Index: src/sys/ufs/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.137 src/sys/ufs/ffs/ffs_alloc.c:1.138
--- src/sys/ufs/ffs/ffs_alloc.c:1.137 Sun Jun 23 07:28:37 2013
+++ src/sys/ufs/ffs/ffs_alloc.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_alloc.c,v 1.137 2013/06/23 07:28:37 dholland Exp $ */
+/* $NetBSD: ffs_alloc.c,v 1.138 2013/06/23 22:03:34 dholland 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.137 2013/06/23 07:28:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.138 2013/06/23 22:03:34 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -134,7 +134,7 @@ ffs_check_bad_allocation(const char *fun
long size, dev_t dev, ino_t inum)
{
if ((u_int)size > fs->fs_bsize || ffs_fragoff(fs, size) != 0 ||
- fragnum(fs, bno) + ffs_numfrags(fs, size) > fs->fs_frag) {
+ ffs_fragnum(fs, bno) + ffs_numfrags(fs, size) > fs->fs_frag) {
printf("dev = 0x%llx, bno = %" PRId64 " bsize = %d, "
"size = %ld, fs = %s\n",
(long long)dev, bno, fs->fs_bsize, size, fs->fs_fsmnt);
@@ -725,7 +725,7 @@ ffs_dirpref(struct inode *pip)
minifree = avgifree - fs->fs_ipg / 4;
if (minifree < 0)
minifree = 0;
- minbfree = avgbfree - fragstoblks(fs, fs->fs_fpg) / 4;
+ minbfree = avgbfree - ffs_fragstoblks(fs, fs->fs_fpg) / 4;
if (minbfree < 0)
minbfree = 0;
cgsize = (int64_t)fs->fs_fsize * fs->fs_fpg;
@@ -831,7 +831,7 @@ ffs_blkpref_ufs1(struct inode *ip, daddr
if (flags & B_METAONLY)
return ip->i_ffs_first_indir_blk;
else
- return ip->i_ffs_first_data_blk + blkstofrags(fs, lbn);
+ return ip->i_ffs_first_data_blk + ffs_blkstofrags(fs, lbn);
}
if (indx % fs->fs_maxbpg == 0 || bap[indx - 1] == 0) {
@@ -895,7 +895,7 @@ ffs_blkpref_ufs2(struct inode *ip, daddr
if (flags & B_METAONLY)
return ip->i_ffs_first_indir_blk;
else
- return ip->i_ffs_first_data_blk + blkstofrags(fs, lbn);
+ return ip->i_ffs_first_data_blk + ffs_blkstofrags(fs, lbn);
}
if (indx % fs->fs_maxbpg == 0 || bap[indx - 1] == 0) {
@@ -1021,8 +1021,8 @@ ffs_fragextend(struct inode *ip, int cg,
if (fs->fs_cs(fs, cg).cs_nffree < ffs_numfrags(fs, nsize - osize))
return (0);
frags = ffs_numfrags(fs, nsize);
- bbase = fragnum(fs, bprev);
- if (bbase > fragnum(fs, (bprev + frags - 1))) {
+ bbase = ffs_fragnum(fs, bprev);
+ if (bbase > ffs_fragnum(fs, (bprev + frags - 1))) {
/* cannot extend across a block boundary */
return (0);
}
@@ -1222,12 +1222,12 @@ ffs_alloccgblk(struct inode *ip, struct
if (bpref == 0 || dtog(fs, bpref) != ufs_rw32(cgp->cg_cgx, needswap)) {
bpref = ufs_rw32(cgp->cg_rotor, needswap);
} else {
- bpref = blknum(fs, bpref);
+ bpref = ffs_blknum(fs, bpref);
bno = dtogd(fs, bpref);
/*
* if the requested block is available, use it
*/
- if (ffs_isblock(fs, blksfree, fragstoblks(fs, bno)))
+ if (ffs_isblock(fs, blksfree, ffs_fragstoblks(fs, bno)))
goto gotit;
/*
* if the requested data block isn't available and we are
@@ -1245,7 +1245,7 @@ ffs_alloccgblk(struct inode *ip, struct
return (0);
cgp->cg_rotor = ufs_rw32(bno, needswap);
gotit:
- blkno = fragstoblks(fs, bno);
+ blkno = ffs_fragstoblks(fs, bno);
ffs_clrblock(fs, blksfree, blkno);
ffs_clusteracct(fs, cgp, blkno, -1);
ufs_add32(cgp->cg_cs.cs_nbfree, -1, needswap);
@@ -1460,7 +1460,7 @@ ffs_blkalloc_ump(struct ufsmount *ump, d
const int needswap = UFS_FSNEEDSWAP(fs);
KASSERT((u_int)size <= fs->fs_bsize && ffs_fragoff(fs, size) == 0 &&
- fragnum(fs, bno) + ffs_numfrags(fs, size) <= fs->fs_frag);
+ ffs_fragnum(fs, bno) + ffs_numfrags(fs, size) <= fs->fs_frag);
KASSERT(bno < fs->fs_size);
cg = dtog(fs, bno);
@@ -1481,7 +1481,7 @@ ffs_blkalloc_ump(struct ufsmount *ump, d
mutex_enter(&ump->um_lock);
if (size == fs->fs_bsize) {
- fragno = fragstoblks(fs, cgbno);
+ fragno = ffs_fragstoblks(fs, cgbno);
if (!ffs_isblock(fs, blksfree, fragno)) {
mutex_exit(&ump->um_lock);
brelse(bp, 0);
@@ -1493,7 +1493,7 @@ ffs_blkalloc_ump(struct ufsmount *ump, d
fs->fs_cstotal.cs_nbfree--;
fs->fs_cs(fs, cg).cs_nbfree--;
} else {
- bbase = cgbno - fragnum(fs, cgbno);
+ bbase = cgbno - ffs_fragnum(fs, cgbno);
frags = ffs_numfrags(fs, size);
for (i = 0; i < frags; i++) {
@@ -1506,7 +1506,7 @@ ffs_blkalloc_ump(struct ufsmount *ump, d
/*
* if a complete block is being split, account for it
*/
- fragno = fragstoblks(fs, bbase);
+ fragno = ffs_fragstoblks(fs, bbase);
if (ffs_isblock(fs, blksfree, fragno)) {
ufs_add32(cgp->cg_cs.cs_nffree, fs->fs_frag, needswap);
fs->fs_cstotal.cs_nffree += fs->fs_frag;
@@ -1616,7 +1616,7 @@ ffs_blkfree_td(struct fs *fs, struct dis
while (td->size) {
todo = min(td->size,
- ffs_lfragtosize(fs, (fs->fs_frag - fragnum(fs, td->bno))));
+ ffs_lfragtosize(fs, (fs->fs_frag - ffs_fragnum(fs, td->bno))));
ffs_blkfree_cg(fs, td->devvp, td->bno, todo);
td->bno += ffs_numfrags(fs, todo);
td->size -= todo;
@@ -1838,7 +1838,7 @@ ffs_blkfree_snap(struct fs *fs, struct v
cg = dtog(fs, bno);
dev = VTOI(devvp)->i_devvp->v_rdev;
ump = VFSTOUFS(devvp->v_mount);
- cgblkno = fragstoblks(fs, cgtod(fs, cg));
+ cgblkno = ffs_fragstoblks(fs, cgtod(fs, cg));
error = ffs_check_bad_allocation(__func__, fs, bno, size, dev, inum);
if (error)
@@ -1880,7 +1880,7 @@ ffs_blkfree_common(struct ufsmount *ump,
blksfree = cg_blksfree(cgp, needswap);
mutex_enter(&ump->um_lock);
if (size == fs->fs_bsize) {
- fragno = fragstoblks(fs, cgbno);
+ fragno = ffs_fragstoblks(fs, cgbno);
if (!ffs_isfreeblock(fs, blksfree, fragno)) {
if (devvp_is_snapshot) {
mutex_exit(&ump->um_lock);
@@ -1907,7 +1907,7 @@ ffs_blkfree_common(struct ufsmount *ump,
ufs_add32(old_cg_blktot(cgp, needswap)[i], 1, needswap);
}
} else {
- bbase = cgbno - fragnum(fs, cgbno);
+ bbase = cgbno - ffs_fragnum(fs, cgbno);
/*
* decrement the counts associated with the old frags
*/
@@ -1938,7 +1938,7 @@ ffs_blkfree_common(struct ufsmount *ump,
/*
* if a complete block has been reassembled, account for it
*/
- fragno = fragstoblks(fs, bbase);
+ fragno = ffs_fragstoblks(fs, bbase);
if (ffs_isblock(fs, blksfree, fragno)) {
ufs_add32(cgp->cg_cs.cs_nffree, -fs->fs_frag, needswap);
fs->fs_cstotal.cs_nffree -= fs->fs_frag;
@@ -2040,7 +2040,7 @@ ffs_freefile_snap(struct fs *fs, struct
cg = ino_to_cg(fs, ino);
dev = VTOI(devvp)->i_devvp->v_rdev;
ump = VFSTOUFS(devvp->v_mount);
- cgbno = fragstoblks(fs, cgtod(fs, cg));
+ cgbno = ffs_fragstoblks(fs, cgtod(fs, cg));
if ((u_int)ino >= fs->fs_ipg * fs->fs_ncg)
panic("ifree: range: dev = 0x%llx, ino = %llu, fs = %s",
(unsigned long long)dev, (unsigned long long)ino,
@@ -2125,7 +2125,7 @@ ffs_checkfreefile(struct fs *fs, struct
cg = ino_to_cg(fs, ino);
if (devvp_is_snapshot)
- cgbno = fragstoblks(fs, cgtod(fs, cg));
+ cgbno = ffs_fragstoblks(fs, cgtod(fs, cg));
else
cgbno = FFS_FSBTODB(fs, cgtod(fs, cg));
if ((u_int)ino >= fs->fs_ipg * fs->fs_ncg)
Index: src/sys/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.126 src/sys/ufs/ffs/ffs_snapshot.c:1.127
--- src/sys/ufs/ffs/ffs_snapshot.c:1.126 Sun Jun 23 07:28:37 2013
+++ src/sys/ufs/ffs/ffs_snapshot.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.126 2013/06/23 07:28:37 dholland Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.127 2013/06/23 22:03:34 dholland 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.126 2013/06/23 07:28:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.127 2013/06/23 22:03:34 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -503,7 +503,7 @@ snapshot_setup(struct mount *mp, struct
if (error)
goto out;
bawrite(nbp);
- blkno = fragstoblks(fs, fs->fs_csaddr);
+ blkno = ffs_fragstoblks(fs, fs->fs_csaddr);
len = howmany(fs->fs_cssize, fs->fs_bsize);
for (loc = 0; loc < len; loc++) {
error = ffs_balloc(vp, ffs_lblktosize(fs, (off_t)(blkno + loc)),
@@ -728,17 +728,17 @@ snapshot_expunge(struct mount *mp, struc
*snaplist = malloc(*snaplistsize * sizeof(daddr_t), M_UFSMNT, M_WAITOK);
blkp = &(*snaplist)[1];
*blkp++ = ffs_lblkno(fs, fs->fs_sblockloc);
- blkno = fragstoblks(fs, fs->fs_csaddr);
+ blkno = ffs_fragstoblks(fs, fs->fs_csaddr);
for (cg = 0; cg < fs->fs_ncg; cg++) {
- if (fragstoblks(fs, cgtod(fs, cg)) > blkno)
+ if (ffs_fragstoblks(fs, cgtod(fs, cg)) > blkno)
break;
- *blkp++ = fragstoblks(fs, cgtod(fs, cg));
+ *blkp++ = ffs_fragstoblks(fs, cgtod(fs, cg));
}
len = howmany(fs->fs_cssize, fs->fs_bsize);
for (loc = 0; loc < len; loc++)
*blkp++ = blkno + loc;
for (; cg < fs->fs_ncg; cg++)
- *blkp++ = fragstoblks(fs, cgtod(fs, cg));
+ *blkp++ = ffs_fragstoblks(fs, cgtod(fs, cg));
(*snaplist)[0] = blkp - &(*snaplist)[0];
out:
@@ -846,7 +846,7 @@ snapshot_writefs(struct mount *mp, struc
* Write the superblock and its summary information
* to the snapshot.
*/
- blkno = fragstoblks(fs, fs->fs_csaddr);
+ blkno = ffs_fragstoblks(fs, fs->fs_csaddr);
len = howmany(fs->fs_cssize, fs->fs_bsize);
space = copyfs->fs_csp;
#ifdef FFS_EI
@@ -1056,7 +1056,7 @@ expunge(struct vnode *snapvp, struct ino
* Prepare to expunge the inode. If its inode block has not
* yet been copied, then allocate and fill the copy.
*/
- lbn = fragstoblks(fs, ino_to_fsba(fs, cancelip->i_number));
+ lbn = ffs_fragstoblks(fs, ino_to_fsba(fs, cancelip->i_number));
error = snapblkaddr(snapvp, lbn, &blkno);
if (error)
return error;
@@ -1177,7 +1177,7 @@ indiracct(struct vnode *snapvp, struct v
if (error)
return error;
if ((bp->b_oflags & (BO_DONE | BO_DELWRI)) == 0 && (error =
- rwfsblk(bp->b_vp, B_READ, bp->b_data, fragstoblks(fs, blkno)))) {
+ rwfsblk(bp->b_vp, B_READ, bp->b_data, ffs_fragstoblks(fs, blkno)))) {
brelse(bp, 0);
return (error);
}
@@ -1253,7 +1253,7 @@ snapacct(struct vnode *vp, void *bap, in
blkno = idb_get(ip, bap, oldblkp);
if (blkno == 0 || blkno == BLK_NOCOPY || blkno == BLK_SNAP)
continue;
- lbn = fragstoblks(fs, blkno);
+ lbn = ffs_fragstoblks(fs, blkno);
if (lbn < UFS_NDADDR) {
blkno = db_get(ip, lbn);
ip->i_flag |= IN_CHANGE | IN_UPDATE;
@@ -1326,7 +1326,7 @@ mapacct(struct vnode *vp, void *bap, int
if (acctit && expungetype == BLK_SNAP && blkno != BLK_SNAP)
*ip->i_snapblklist++ = lblkno;
if (blkno == BLK_SNAP)
- blkno = blkstofrags(fs, lblkno);
+ blkno = ffs_blkstofrags(fs, lblkno);
ffs_blkfree_snap(fs, vp, blkno, fs->fs_bsize, inum);
if (wbreak > 0 && (++n % wbreak) == 0) {
UFS_WAPBL_END(mp);
@@ -1475,7 +1475,7 @@ ffs_snapremove(struct vnode *vp)
dblk = db_get(ip, blkno);
if (dblk == BLK_NOCOPY || dblk == BLK_SNAP)
db_assign(ip, blkno, 0);
- else if ((dblk == blkstofrags(fs, blkno) &&
+ else if ((dblk == ffs_blkstofrags(fs, blkno) &&
ffs_snapblkfree(fs, ip->i_devvp, dblk, fs->fs_bsize,
ip->i_number))) {
DIP_ADD(ip, blocks, -btodb(fs->fs_bsize));
@@ -1496,7 +1496,7 @@ ffs_snapremove(struct vnode *vp)
dblk = idb_get(ip, ibp->b_data, loc);
if (dblk == BLK_NOCOPY || dblk == BLK_SNAP)
idb_assign(ip, ibp->b_data, loc, 0);
- else if (dblk == blkstofrags(fs, blkno) &&
+ else if (dblk == ffs_blkstofrags(fs, blkno) &&
ffs_snapblkfree(fs, ip->i_devvp, dblk,
fs->fs_bsize, ip->i_number)) {
DIP_ADD(ip, blocks, -btodb(fs->fs_bsize));
@@ -1554,7 +1554,7 @@ ffs_snapblkfree(struct fs *fs, struct vn
int indiroff = 0, error = 0, claimedblk = 0;
si = VFSTOUFS(mp)->um_snapinfo;
- lbn = fragstoblks(fs, bno);
+ lbn = ffs_fragstoblks(fs, bno);
mutex_enter(&si->si_snaplock);
mutex_enter(&si->si_lock);
si->si_owner = curlwp;
@@ -1901,7 +1901,7 @@ ffs_copyonwrite(void *v, struct buf *bp,
* By doing these checks we avoid several potential deadlocks.
*/
fs = ip->i_fs;
- lbn = fragstoblks(fs, FFS_DBTOFSB(fs, bp->b_blkno));
+ lbn = ffs_fragstoblks(fs, FFS_DBTOFSB(fs, bp->b_blkno));
if (bp->b_blkno >= FFS_FSBTODB(fs, fs->fs_size)) {
mutex_exit(&si->si_lock);
return 0;
@@ -2187,7 +2187,7 @@ rwfsblk(struct vnode *vp, int flags, voi
nbp->b_bcount = nbp->b_bufsize = fs->fs_bsize;
nbp->b_error = 0;
nbp->b_data = data;
- nbp->b_blkno = nbp->b_rawblkno = FFS_FSBTODB(fs, blkstofrags(fs, lbn));
+ nbp->b_blkno = nbp->b_rawblkno = FFS_FSBTODB(fs, ffs_blkstofrags(fs, lbn));
nbp->b_proc = NULL;
nbp->b_dev = ip->i_devvp->v_rdev;
SET(nbp->b_cflags, BC_BUSY); /* mark buffer busy */
@@ -2223,7 +2223,7 @@ syncsnap(struct vnode *vp)
KASSERT(bp->b_bcount == fs->fs_bsize);
mutex_exit(&bufcache_lock);
error = rwfsblk(vp, B_WRITE, bp->b_data,
- fragstoblks(fs, FFS_DBTOFSB(fs, bp->b_blkno)));
+ ffs_fragstoblks(fs, FFS_DBTOFSB(fs, bp->b_blkno)));
brelse(bp, BC_INVAL | BC_VFLUSH);
if (error)
return error;
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.285 src/sys/ufs/ffs/ffs_vfsops.c:1.286
--- src/sys/ufs/ffs/ffs_vfsops.c:1.285 Sun Jun 23 02:06:05 2013
+++ src/sys/ufs/ffs/ffs_vfsops.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.285 2013/06/23 02:06:05 dholland Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.286 2013/06/23 22:03:34 dholland 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.285 2013/06/23 02:06:05 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.286 2013/06/23 22:03:34 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -1602,7 +1602,7 @@ ffs_statvfs(struct mount *mp, struct sta
sbp->f_frsize = fs->fs_fsize;
sbp->f_iosize = fs->fs_bsize;
sbp->f_blocks = fs->fs_dsize;
- sbp->f_bfree = blkstofrags(fs, fs->fs_cstotal.cs_nbfree) +
+ sbp->f_bfree = ffs_blkstofrags(fs, fs->fs_cstotal.cs_nbfree) +
fs->fs_cstotal.cs_nffree + FFS_DBTOFSB(fs, fs->fs_pendingblocks);
sbp->f_bresvd = ((u_int64_t) fs->fs_dsize * (u_int64_t)
fs->fs_minfree) / (u_int64_t) 100;
Index: src/sys/ufs/ffs/ffs_wapbl.c
diff -u src/sys/ufs/ffs/ffs_wapbl.c:1.21 src/sys/ufs/ffs/ffs_wapbl.c:1.22
--- src/sys/ufs/ffs/ffs_wapbl.c:1.21 Sun Jun 23 07:28:37 2013
+++ src/sys/ufs/ffs/ffs_wapbl.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_wapbl.c,v 1.21 2013/06/23 07:28:37 dholland Exp $ */
+/* $NetBSD: ffs_wapbl.c,v 1.22 2013/06/23 22:03:34 dholland 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.21 2013/06/23 07:28:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.22 2013/06/23 22:03:34 dholland Exp $");
#define WAPBL_INTERNAL
@@ -793,7 +793,7 @@ wapbl_find_log_start(struct mount *mp, s
min_desired_blks = desired_blks / 4;
/* Look at number of blocks per CG. If it's too small, bail early. */
- bpcg = fragstoblks(fs, fs->fs_fpg);
+ bpcg = ffs_fragstoblks(fs, fs->fs_fpg);
if (min_desired_blks > bpcg) {
printf("ffs_wapbl: cylinder group size of %" PRId64 " MB "
" is not big enough for journal\n",
@@ -851,7 +851,7 @@ wapbl_find_log_start(struct mount *mp, s
if (freeblks > best_blks) {
best_blks = freeblks;
- best_addr = blkstofrags(fs, start_addr) +
+ best_addr = ffs_blkstofrags(fs, start_addr) +
cgbase(fs, cg);
if (freeblks >= desired_blks) {
@@ -872,7 +872,7 @@ wapbl_find_log_start(struct mount *mp, s
*indir_addr = 0;
} else {
/* put indirect blocks at start, and data blocks after */
- *addr = best_addr + blkstofrags(fs, indir_blks);
+ *addr = best_addr + ffs_blkstofrags(fs, indir_blks);
*indir_addr = best_addr;
}
*size = min(desired_blks, best_blks) - indir_blks;
Index: src/sys/ufs/ffs/fs.h
diff -u src/sys/ufs/ffs/fs.h:1.63 src/sys/ufs/ffs/fs.h:1.64
--- src/sys/ufs/ffs/fs.h:1.63 Sun Jun 23 07:28:37 2013
+++ src/sys/ufs/ffs/fs.h Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.h,v 1.63 2013/06/23 07:28:37 dholland Exp $ */
+/* $NetBSD: fs.h,v 1.64 2013/06/23 22:03:34 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -470,7 +470,7 @@ struct fs {
/* block map */ howmany((fpg), NBBY) +\
/* if present */ ((fs)->fs_contigsumsize <= 0 ? 0 : \
/* cluster sum */ (fs)->fs_contigsumsize * sizeof(int32_t) + \
- /* cluster map */ howmany(fragstoblks(fs, (fpg)), NBBY)))
+ /* cluster map */ howmany(ffs_fragstoblks(fs, (fpg)), NBBY)))
#define CGSIZE(fs) CGSIZE_IF((fs), (fs)->fs_ipg, (fs)->fs_fpg)
@@ -636,7 +636,7 @@ struct ocg {
#define ino_to_cg(fs, x) ((x) / (fs)->fs_ipg)
#define ino_to_fsba(fs, x) \
((daddr_t)(cgimin(fs, ino_to_cg(fs, x)) + \
- (blkstofrags((fs), (((x) % (fs)->fs_ipg) / FFS_INOPB(fs))))))
+ (ffs_blkstofrags((fs), (((x) % (fs)->fs_ipg) / FFS_INOPB(fs))))))
#define ino_to_fsbo(fs, x) ((x) % FFS_INOPB(fs))
/*
@@ -681,13 +681,13 @@ struct ocg {
(((size) + (fs)->fs_qbmask) & (fs)->fs_bmask)
#define ffs_fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \
(((size) + (fs)->fs_qfmask) & (fs)->fs_fmask)
-#define fragstoblks(fs, frags) /* calculates (frags / fs->fs_frag) */ \
+#define ffs_fragstoblks(fs, frags) /* calculates (frags / fs->fs_frag) */ \
((frags) >> (fs)->fs_fragshift)
-#define blkstofrags(fs, blks) /* calculates (blks * fs->fs_frag) */ \
+#define ffs_blkstofrags(fs, blks) /* calculates (blks * fs->fs_frag) */ \
((blks) << (fs)->fs_fragshift)
-#define fragnum(fs, fsb) /* calculates (fsb % fs->fs_frag) */ \
+#define ffs_fragnum(fs, fsb) /* calculates (fsb % fs->fs_frag) */ \
((fsb) & ((fs)->fs_frag - 1))
-#define blknum(fs, fsb) /* calculates rounddown(fsb, fs->fs_frag) */ \
+#define ffs_blknum(fs, fsb) /* calculates rounddown(fsb, fs->fs_frag) */ \
((fsb) &~ ((fs)->fs_frag - 1))
/*
@@ -695,7 +695,7 @@ struct ocg {
* percentage to hold in reserve.
*/
#define freespace(fs, percentreserved) \
- (blkstofrags((fs), (fs)->fs_cstotal.cs_nbfree) + \
+ (ffs_blkstofrags((fs), (fs)->fs_cstotal.cs_nbfree) + \
(fs)->fs_cstotal.cs_nffree - \
(((off_t)((fs)->fs_dsize)) * (percentreserved) / 100))
Index: src/usr.sbin/makefs/ffs/ffs_alloc.c
diff -u src/usr.sbin/makefs/ffs/ffs_alloc.c:1.26 src/usr.sbin/makefs/ffs/ffs_alloc.c:1.27
--- src/usr.sbin/makefs/ffs/ffs_alloc.c:1.26 Sun Jun 23 07:28:37 2013
+++ src/usr.sbin/makefs/ffs/ffs_alloc.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_alloc.c,v 1.26 2013/06/23 07:28:37 dholland Exp $ */
+/* $NetBSD: ffs_alloc.c,v 1.27 2013/06/23 22:03:34 dholland Exp $ */
/* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
/*
@@ -47,7 +47,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_alloc.c,v 1.26 2013/06/23 07:28:37 dholland Exp $");
+__RCSID("$NetBSD: ffs_alloc.c,v 1.27 2013/06/23 22:03:34 dholland Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -395,12 +395,12 @@ ffs_alloccgblk(struct inode *ip, struct
if (bpref == 0 || dtog(fs, bpref) != ufs_rw32(cgp->cg_cgx, needswap)) {
bpref = ufs_rw32(cgp->cg_rotor, needswap);
} else {
- bpref = blknum(fs, bpref);
+ bpref = ffs_blknum(fs, bpref);
bno = dtogd(fs, bpref);
/*
* if the requested block is available, use it
*/
- if (ffs_isblock(fs, blksfree, fragstoblks(fs, bno)))
+ if (ffs_isblock(fs, blksfree, ffs_fragstoblks(fs, bno)))
goto gotit;
}
/*
@@ -411,7 +411,7 @@ ffs_alloccgblk(struct inode *ip, struct
return (0);
cgp->cg_rotor = ufs_rw32(bno, needswap);
gotit:
- blkno = fragstoblks(fs, bno);
+ blkno = ffs_fragstoblks(fs, bno);
ffs_clrblock(fs, blksfree, (long)blkno);
ffs_clusteracct(fs, cgp, blkno, -1);
ufs_add32(cgp->cg_cs.cs_nbfree, -1, needswap);
@@ -440,7 +440,7 @@ ffs_blkfree(struct inode *ip, daddr_t bn
const int needswap = UFS_FSNEEDSWAP(fs);
if (size > fs->fs_bsize || ffs_fragoff(fs, size) != 0 ||
- fragnum(fs, bno) + ffs_numfrags(fs, size) > fs->fs_frag) {
+ ffs_fragnum(fs, bno) + ffs_numfrags(fs, size) > fs->fs_frag) {
errx(1, "blkfree: bad size: bno %lld bsize %d size %ld",
(long long)bno, fs->fs_bsize, size);
}
@@ -463,7 +463,7 @@ ffs_blkfree(struct inode *ip, daddr_t bn
}
cgbno = dtogd(fs, bno);
if (size == fs->fs_bsize) {
- fragno = fragstoblks(fs, cgbno);
+ fragno = ffs_fragstoblks(fs, cgbno);
if (!ffs_isfreeblock(fs, cg_blksfree(cgp, needswap), fragno)) {
errx(1, "blkfree: freeing free block %lld",
(long long)bno);
@@ -474,7 +474,7 @@ ffs_blkfree(struct inode *ip, daddr_t bn
fs->fs_cstotal.cs_nbfree++;
fs->fs_cs(fs, cg).cs_nbfree++;
} else {
- bbase = cgbno - fragnum(fs, cgbno);
+ bbase = cgbno - ffs_fragnum(fs, cgbno);
/*
* decrement the counts associated with the old frags
*/
@@ -502,7 +502,7 @@ ffs_blkfree(struct inode *ip, daddr_t bn
/*
* if a complete block has been reassembled, account for it
*/
- fragno = fragstoblks(fs, bbase);
+ fragno = ffs_fragstoblks(fs, bbase);
if (ffs_isblock(fs, cg_blksfree(cgp, needswap), fragno)) {
ufs_add32(cgp->cg_cs.cs_nffree, -fs->fs_frag, needswap);
fs->fs_cstotal.cs_nffree -= fs->fs_frag;
Index: src/usr.sbin/makefs/ffs/mkfs.c
diff -u src/usr.sbin/makefs/ffs/mkfs.c:1.30 src/usr.sbin/makefs/ffs/mkfs.c:1.31
--- src/usr.sbin/makefs/ffs/mkfs.c:1.30 Sun Jun 23 07:28:37 2013
+++ src/usr.sbin/makefs/ffs/mkfs.c Sun Jun 23 22:03:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.30 2013/06/23 07:28:37 dholland Exp $ */
+/* $NetBSD: mkfs.c,v 1.31 2013/06/23 22:03:34 dholland Exp $ */
/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -48,7 +48,7 @@
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else
#ifdef __RCSID
-__RCSID("$NetBSD: mkfs.c,v 1.30 2013/06/23 07:28:37 dholland Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.31 2013/06/23 22:03:34 dholland Exp $");
#endif
#endif
#endif /* not lint */
@@ -453,12 +453,12 @@ ffs_mkfs(const char *fsys, const fsinfo_
sblock.fs_dsize = sblock.fs_size - sblock.fs_sblkno -
sblock.fs_ncg * (sblock.fs_dblkno - sblock.fs_sblkno);
sblock.fs_cstotal.cs_nbfree =
- fragstoblks(&sblock, sblock.fs_dsize) -
+ ffs_fragstoblks(&sblock, sblock.fs_dsize) -
howmany(csfrags, sblock.fs_frag);
sblock.fs_cstotal.cs_nffree =
- fragnum(&sblock, sblock.fs_size) +
- (fragnum(&sblock, csfrags) > 0 ?
- sblock.fs_frag - fragnum(&sblock, csfrags) : 0);
+ ffs_fragnum(&sblock, sblock.fs_size) +
+ (ffs_fragnum(&sblock, csfrags) > 0 ?
+ sblock.fs_frag - ffs_fragnum(&sblock, csfrags) : 0);
sblock.fs_cstotal.cs_nifree = sblock.fs_ncg * sblock.fs_ipg - UFS_ROOTINO;
sblock.fs_cstotal.cs_ndir = 0;
sblock.fs_dsize -= csfrags;
@@ -654,7 +654,7 @@ initcg(int cylno, time_t utime, const fs
acg.cg_clusteroff = acg.cg_clustersumoff +
(sblock.fs_contigsumsize + 1) * sizeof(int32_t);
acg.cg_nextfreeoff = acg.cg_clusteroff +
- howmany(fragstoblks(&sblock, sblock.fs_fpg), CHAR_BIT);
+ howmany(ffs_fragstoblks(&sblock, sblock.fs_fpg), CHAR_BIT);
}
if (acg.cg_nextfreeoff > sblock.fs_cgsize) {
printf("Panic: cylinder group too big\n");
