Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Stick ffs_, ext2_, chfs_, filecore_, cd9660_, or mfs_ in fro...
details: https://anonhg.NetBSD.org/src/rev/6eaf72d51cec
branches: trunk
changeset: 787552:6eaf72d51cec
user: dholland <dholland%NetBSD.org@localhost>
date: Sun Jun 23 07:28:36 2013 +0000
description:
Stick ffs_, ext2_, chfs_, filecore_, cd9660_, or mfs_ in front of
the following symbols so as to disambiguate fully. (Christos already
did the lfs ones.)
lblkno
lblktosize
lfragtosize
numfrags
blkroundup
fragroundup
diffstat:
sbin/fsck_ext2fs/dir.c | 6 +-
sbin/fsck_ext2fs/inode.c | 6 +-
sbin/fsck_ffs/dir.c | 6 +-
sbin/fsck_ffs/inode.c | 20 ++++++------
sbin/fsck_ffs/pass1.c | 8 ++--
sbin/fsck_ffs/pass5.c | 6 +-
sbin/fsck_ffs/setup.c | 6 +-
sbin/newfs/mkfs.c | 26 ++++++++--------
sbin/resize_ffs/resize_ffs.c | 16 +++++-----
sbin/scan_ffs/scan_ffs.c | 14 +-------
sys/fs/cd9660/cd9660_extern.h | 6 +-
sys/fs/cd9660/cd9660_lookup.c | 10 +++---
sys/fs/cd9660/cd9660_vfsops.c | 6 +-
sys/fs/cd9660/cd9660_vnops.c | 8 ++--
sys/fs/filecorefs/filecore_extern.h | 6 +-
sys/fs/filecorefs/filecore_vnops.c | 6 +-
sys/lib/libsa/ext2fs.c | 4 +-
sys/lib/libsa/lfsv1.c | 4 +-
sys/lib/libsa/lfsv2.c | 4 +-
sys/lib/libsa/minixfs3.c | 4 +-
sys/lib/libsa/minixfs3.h | 4 +-
sys/lib/libsa/ufs.c | 7 +++-
sys/ufs/chfs/chfs_vnops.c | 30 +++++++++---------
sys/ufs/ext2fs/ext2fs.h | 10 +++---
sys/ufs/ext2fs/ext2fs_balloc.c | 6 +-
sys/ufs/ext2fs/ext2fs_inode.c | 6 +-
sys/ufs/ext2fs/ext2fs_readwrite.c | 12 +++---
sys/ufs/ext2fs/ext2fs_subr.c | 6 +-
sys/ufs/ffs/ffs_alloc.c | 44 ++++++++++++++--------------
sys/ufs/ffs/ffs_balloc.c | 44 ++++++++++++++--------------
sys/ufs/ffs/ffs_inode.c | 20 ++++++------
sys/ufs/ffs/ffs_snapshot.c | 56 ++++++++++++++++++------------------
sys/ufs/ffs/ffs_vnops.c | 12 +++---
sys/ufs/ffs/ffs_wapbl.c | 14 ++++----
sys/ufs/ffs/fs.h | 20 ++++++------
sys/ufs/ufs/ufs_readwrite.c | 28 +++++++++++-------
usr.sbin/makefs/ffs/ffs_alloc.c | 10 +++---
usr.sbin/makefs/ffs/ffs_balloc.c | 32 ++++++++++----------
usr.sbin/makefs/ffs/mkfs.c | 14 ++++----
usr.sbin/quot/quot.c | 16 +++++-----
usr.sbin/quotacheck/quotacheck.c | 6 +-
41 files changed, 284 insertions(+), 285 deletions(-)
diffs (truncated from 2165 to 300 lines):
diff -r ee2d45293933 -r 6eaf72d51cec sbin/fsck_ext2fs/dir.c
--- a/sbin/fsck_ext2fs/dir.c Sun Jun 23 06:40:26 2013 +0000
+++ b/sbin/fsck_ext2fs/dir.c Sun Jun 23 07:28:36 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.27 2013/06/09 17:57:09 dholland Exp $ */
+/* $NetBSD: dir.c,v 1.28 2013/06/23 07:28:36 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.5 (Berkeley) 12/8/94";
#else
-__RCSID("$NetBSD: dir.c,v 1.27 2013/06/09 17:57:09 dholland Exp $");
+__RCSID("$NetBSD: dir.c,v 1.28 2013/06/23 07:28:36 dholland Exp $");
#endif
#endif /* not lint */
@@ -558,7 +558,7 @@
struct bufarea *bp;
char *firstblk;
- lastbn = lblkno(&sblock, inosize(dp));
+ lastbn = ext2_lblkno(&sblock, inosize(dp));
if (lastbn >= EXT2FS_NDADDR - 1 || fs2h32(dp->e2di_blocks[lastbn]) == 0 ||
inosize(dp) == 0) {
return (0);
diff -r ee2d45293933 -r 6eaf72d51cec sbin/fsck_ext2fs/inode.c
--- a/sbin/fsck_ext2fs/inode.c Sun Jun 23 06:40:26 2013 +0000
+++ b/sbin/fsck_ext2fs/inode.c Sun Jun 23 07:28:36 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.35 2013/06/23 02:06:04 dholland Exp $ */
+/* $NetBSD: inode.c,v 1.36 2013/06/23 07:28:36 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
#if 0
static char sccsid[] = "@(#)inode.c 8.5 (Berkeley) 2/8/95";
#else
-__RCSID("$NetBSD: inode.c,v 1.35 2013/06/23 02:06:04 dholland Exp $");
+__RCSID("$NetBSD: inode.c,v 1.36 2013/06/23 07:28:36 dholland Exp $");
#endif
#endif /* not lint */
@@ -457,7 +457,7 @@
nextino = 1;
lastinum = 1;
readcnt = 0;
- inobufsize = blkroundup(&sblock, INOBUFSIZE);
+ inobufsize = ext2_blkroundup(&sblock, INOBUFSIZE);
fullcnt = inobufsize / EXT2_DINODE_SIZE(&sblock);
readpercg = sblock.e2fs.e2fs_ipg / fullcnt;
partialcnt = sblock.e2fs.e2fs_ipg % fullcnt;
diff -r ee2d45293933 -r 6eaf72d51cec sbin/fsck_ffs/dir.c
--- a/sbin/fsck_ffs/dir.c Sun Jun 23 06:40:26 2013 +0000
+++ b/sbin/fsck_ffs/dir.c Sun Jun 23 07:28:36 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.56 2013/06/19 17:51:25 dholland Exp $ */
+/* $NetBSD: dir.c,v 1.57 2013/06/23 07:28:36 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.8 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: dir.c,v 1.56 2013/06/19 17:51:25 dholland Exp $");
+__RCSID("$NetBSD: dir.c,v 1.57 2013/06/23 07:28:36 dholland Exp $");
#endif
#endif /* not lint */
@@ -716,7 +716,7 @@
else
dp1 = &dp->dp1;
- lastbn = lblkno(sblock, iswap64(DIP(dp, size)));
+ lastbn = ffs_lblkno(sblock, iswap64(DIP(dp, size)));
if (lastbn >= UFS_NDADDR - 1 || DIP(dp, db[lastbn]) == 0 ||
DIP(dp, size) == 0)
return (0);
diff -r ee2d45293933 -r 6eaf72d51cec sbin/fsck_ffs/inode.c
--- a/sbin/fsck_ffs/inode.c Sun Jun 23 06:40:26 2013 +0000
+++ b/sbin/fsck_ffs/inode.c Sun Jun 23 07:28:36 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.67 2013/06/23 02:06:04 dholland Exp $ */
+/* $NetBSD: inode.c,v 1.68 2013/06/23 07:28:36 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.67 2013/06/23 02:06:04 dholland Exp $");
+__RCSID("$NetBSD: inode.c,v 1.68 2013/06/23 07:28:36 dholland Exp $");
#endif
#endif /* not lint */
@@ -97,7 +97,7 @@
if (--ndb == 0 &&
(offset = ffs_blkoff(sblock, iswap64(DIP(&dino, size)))) != 0)
idesc->id_numfrags =
- numfrags(sblock, fragroundup(sblock, offset));
+ ffs_numfrags(sblock, ffs_fragroundup(sblock, offset));
else
idesc->id_numfrags = sblock->fs_frag;
if (DIP(&dino, db[i]) == 0) {
@@ -441,7 +441,7 @@
readcnt = 0;
if (inodebuf != NULL)
return;
- inobufsize = blkroundup(sblock, INOBUFSIZE);
+ inobufsize = ffs_blkroundup(sblock, INOBUFSIZE);
fullcnt = inobufsize / (is_ufs2 ? DINODE2_SIZE : DINODE1_SIZE);
readpercg = sblock->fs_ipg / fullcnt;
partialcnt = sblock->fs_ipg % fullcnt;
@@ -786,8 +786,8 @@
(void)time(&t);
dp2->di_atime = iswap64(t);
dp2->di_mtime = dp2->di_ctime = dp2->di_atime;
- dp2->di_size = iswap64(lfragtosize(sblock, nfrags));
- dp2->di_blocks = iswap64(btodb(lfragtosize(sblock, nfrags)));
+ dp2->di_size = iswap64(ffs_lfragtosize(sblock, nfrags));
+ dp2->di_blocks = iswap64(btodb(ffs_lfragtosize(sblock, nfrags)));
} else {
dp1 = &dp->dp1;
dp1->di_db[0] = iswap32(allocblk(nfrags));
@@ -800,8 +800,8 @@
(void)time(&t);
dp1->di_atime = iswap32(t);
dp1->di_mtime = dp1->di_ctime = dp1->di_atime;
- dp1->di_size = iswap64(lfragtosize(sblock, nfrags));
- dp1->di_blocks = iswap32(btodb(lfragtosize(sblock, nfrags)));
+ dp1->di_size = iswap64(ffs_lfragtosize(sblock, nfrags));
+ dp1->di_blocks = iswap32(btodb(ffs_lfragtosize(sblock, nfrags)));
}
n_files++;
inodirty();
@@ -863,7 +863,7 @@
ssize_t
readblk(union dinode *dp, off_t offset, struct bufarea **bp)
{
- daddr_t blkno = lblkno(sblock, offset);
+ daddr_t blkno = ffs_lblkno(sblock, offset);
daddr_t iblkno;
int type = IFMT & iswap16(DIP(dp, mode));
ssize_t filesize = iswap64(DIP(dp, size));
@@ -952,7 +952,7 @@
di_blocks = is_ufs2 ? iswap64(dp->dp2.di_blocks) :
iswap32(dp->dp1.di_blocks);
/* compute location of new block */
- blkno = lblkno(sblock, filesize);
+ blkno = ffs_lblkno(sblock, filesize);
if (blkno < UFS_NDADDR) {
/* easy way: allocate a direct block */
diff -r ee2d45293933 -r 6eaf72d51cec sbin/fsck_ffs/pass1.c
--- a/sbin/fsck_ffs/pass1.c Sun Jun 23 06:40:26 2013 +0000
+++ b/sbin/fsck_ffs/pass1.c Sun Jun 23 07:28:36 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.54 2013/06/23 02:06:04 dholland Exp $ */
+/* $NetBSD: pass1.c,v 1.55 2013/06/23 07:28:36 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: pass1.c,v 1.54 2013/06/23 02:06:04 dholland Exp $");
+__RCSID("$NetBSD: pass1.c,v 1.55 2013/06/23 07:28:36 dholland Exp $");
#endif
#endif /* not lint */
@@ -432,8 +432,8 @@
for (j = 0; j < UFS_NXADDR; j++) {
if (--ndb == 0 &&
(offset = ffs_blkoff(sblock, iswap32(dp->dp2.di_extsize))) != 0)
- idesc->id_numfrags = numfrags(sblock,
- fragroundup(sblock, offset));
+ idesc->id_numfrags = ffs_numfrags(sblock,
+ ffs_fragroundup(sblock, offset));
else
idesc->id_numfrags = sblock->fs_frag;
if (dp->dp2.di_extb[j] == 0)
diff -r ee2d45293933 -r 6eaf72d51cec sbin/fsck_ffs/pass5.c
--- a/sbin/fsck_ffs/pass5.c Sun Jun 23 06:40:26 2013 +0000
+++ b/sbin/fsck_ffs/pass5.c Sun Jun 23 07:28:36 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass5.c,v 1.52 2013/06/23 02:06:04 dholland Exp $ */
+/* $NetBSD: pass5.c,v 1.53 2013/06/23 07:28:36 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.52 2013/06/23 02:06:04 dholland Exp $");
+__RCSID("$NetBSD: pass5.c,v 1.53 2013/06/23 07:28:36 dholland Exp $");
#endif
#endif /* not lint */
@@ -109,7 +109,7 @@
if (preen)
pwarn("%sING CLUSTER MAPS\n",
doit);
- ncgsize = fragroundup(fs, CGSIZE(fs));
+ ncgsize = ffs_fragroundup(fs, CGSIZE(fs));
ncg = realloc(cgrp, ncgsize);
if (ncg == NULL)
errexit(
diff -r ee2d45293933 -r 6eaf72d51cec sbin/fsck_ffs/setup.c
--- a/sbin/fsck_ffs/setup.c Sun Jun 23 06:40:26 2013 +0000
+++ b/sbin/fsck_ffs/setup.c Sun Jun 23 07:28:36 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.99 2013/06/23 02:06:04 dholland Exp $ */
+/* $NetBSD: setup.c,v 1.100 2013/06/23 07:28:36 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95";
#else
-__RCSID("$NetBSD: setup.c,v 1.99 2013/06/23 02:06:04 dholland Exp $");
+__RCSID("$NetBSD: setup.c,v 1.100 2013/06/23 07:28:36 dholland Exp $");
#endif
#endif /* not lint */
@@ -431,7 +431,7 @@
(char *)(&sblock->fs_magic+1) -
(char *)(&sblock->fs_firstfield);
sblock->fs_cgsize =
- fragroundup(sblock, CGSIZE(sblock));
+ ffs_fragroundup(sblock, CGSIZE(sblock));
sbdirty();
dirty(&asblk);
}
diff -r ee2d45293933 -r 6eaf72d51cec sbin/newfs/mkfs.c
--- a/sbin/newfs/mkfs.c Sun Jun 23 06:40:26 2013 +0000
+++ b/sbin/newfs/mkfs.c Sun Jun 23 07:28:36 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.118 2013/06/23 04:14:28 dholland Exp $ */
+/* $NetBSD: mkfs.c,v 1.119 2013/06/23 07:28:36 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.118 2013/06/23 04:14:28 dholland Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.119 2013/06/23 07:28:36 dholland Exp $");
#endif
#endif /* not lint */
@@ -285,7 +285,7 @@
sblock.fs_bshift++;
for (sblock.fs_fshift = 0, i = sblock.fs_fsize; i > 1; i >>= 1)
sblock.fs_fshift++;
- sblock.fs_frag = numfrags(&sblock, sblock.fs_bsize);
+ sblock.fs_frag = ffs_numfrags(&sblock, sblock.fs_bsize);
for (sblock.fs_fragshift = 0, i = sblock.fs_frag; i > 1; i >>= 1)
sblock.fs_fragshift++;
if (sblock.fs_frag > MAXFRAG) {
@@ -373,7 +373,7 @@
* Calculate 'per inode block' so we can allocate less than
* 1 fragment per inode - useful for /dev.
*/
- fragsperinodeblk = MAX(numfrags(&sblock,
+ fragsperinodeblk = MAX(ffs_numfrags(&sblock,
(uint64_t)density * FFS_INOPB(&sblock)), 1);
inodeblks = (sblock.fs_size - sblock.fs_iblkno) /
(sblock.fs_frag + fragsperinodeblk);
@@ -450,7 +450,7 @@
}
sblock.fs_ncg = ncg;
- sblock.fs_cgsize = fragroundup(&sblock, CGSIZE(&sblock));
+ sblock.fs_cgsize = ffs_fragroundup(&sblock, CGSIZE(&sblock));
if (Oflag <= 1) {
sblock.fs_old_spc = sblock.fs_fpg * sblock.fs_old_nspf;
sblock.fs_old_nsect = sblock.fs_old_spc;
@@ -467,7 +467,7 @@
*/
sblock.fs_csaddr = cgdmin(&sblock, 0);
sblock.fs_cssize =
- fragroundup(&sblock, sblock.fs_ncg * sizeof(struct csum));
+ ffs_fragroundup(&sblock, sblock.fs_ncg * sizeof(struct csum));
if (512 % sizeof *fscs_0)
errx(1, "cylinder group summary doesn't fit in sectors");
fscs_0 = mmap(0, 2 * sblock.fs_fsize, PROT_READ|PROT_WRITE,
@@ -482,7 +482,7 @@
/*
* fill in remaining fields of the super block
*/
- sblock.fs_sbsize = fragroundup(&sblock, sizeof(struct fs));
+ sblock.fs_sbsize = ffs_fragroundup(&sblock, sizeof(struct fs));
Home |
Main Index |
Thread Index |
Old Index