aboutsummaryrefslogtreecommitdiffstats
path: root/sbin/growfs
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2017-02-15 19:50:26 +0000
committerEd Maste <emaste@FreeBSD.org>2017-02-15 19:50:26 +0000
commit1dc349ab9564b54c1b1f619045e95f966a9aae86 (patch)
tree9430648d462fa23db629b080e6fa38b22a37260c /sbin/growfs
parent605703b5dfe92b64a2127637f30db6385a89f685 (diff)
downloadsrc-1dc349ab9564b54c1b1f619045e95f966a9aae86.tar.gz
src-1dc349ab9564b54c1b1f619045e95f966a9aae86.zip
prefix UFS symbols with UFS_ to reduce namespace pollution
Specifically: ROOTINO -> UFS_ROOTINO WINO -> UFS_WINO NXADDR -> UFS_NXADDR NDADDR -> UFS_NDADDR NIADDR -> UFS_NIADDR MAXSYMLINKLEN_UFS[12] -> UFS[12]_MAXSYMLINKLEN (for consistency) Also prefix ext2's and nandfs's NDADDR and NIADDR with EXT2_ and NANDFS_ Reviewed by: kib, mckusick Obtained from: NetBSD MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D9536
Notes
Notes: svn path=/head/; revision=313780
Diffstat (limited to 'sbin/growfs')
-rw-r--r--sbin/growfs/debug.c10
-rw-r--r--sbin/growfs/growfs.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index d3710133c013..9a320ecd89ee 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -694,11 +694,11 @@ dbg_dump_ufs1_ino(struct fs *sb, const char *comment, struct ufs1_dinode *ino)
ino->di_ctimensec);
remaining_blocks = howmany(ino->di_size, sb->fs_bsize); /* XXX ts - +1? */
- for (ictr = 0; ictr < MIN(NDADDR, remaining_blocks); ictr++) {
+ for (ictr = 0; ictr < MIN(UFS_NDADDR, remaining_blocks); ictr++) {
fprintf(dbg_log, "db ufs_daddr_t[%x] 0x%08x\n", ictr,
ino->di_db[ictr]);
}
- remaining_blocks -= NDADDR;
+ remaining_blocks -= UFS_NDADDR;
if (remaining_blocks > 0) {
fprintf(dbg_log, "ib ufs_daddr_t[0] 0x%08x\n",
ino->di_ib[0]);
@@ -768,14 +768,14 @@ dbg_dump_ufs2_ino(struct fs *sb, const char *comment, struct ufs2_dinode *ino)
fprintf(dbg_log, "flags u_int32_t 0x%08x\n", ino->di_flags);
fprintf(dbg_log, "extsize u_int32_t 0x%08x\n", ino->di_extsize);
- /* XXX: What do we do with di_extb[NXADDR]? */
+ /* XXX: What do we do with di_extb[UFS_NXADDR]? */
remaining_blocks = howmany(ino->di_size, sb->fs_bsize); /* XXX ts - +1? */
- for (ictr = 0; ictr < MIN(NDADDR, remaining_blocks); ictr++) {
+ for (ictr = 0; ictr < MIN(UFS_NDADDR, remaining_blocks); ictr++) {
fprintf(dbg_log, "db ufs2_daddr_t[%x] 0x%16jx\n", ictr,
ino->di_db[ictr]);
}
- remaining_blocks -= NDADDR;
+ remaining_blocks -= UFS_NDADDR;
if (remaining_blocks > 0) {
fprintf(dbg_log, "ib ufs2_daddr_t[0] 0x%16jx\n",
ino->di_ib[0]);
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index a212d13d3521..0aa4d4586e6f 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -388,7 +388,7 @@ initcg(int cylno, time_t modtime, int fso, unsigned int Nflag)
}
acg.cg_cs.cs_nifree += sblock.fs_ipg;
if (cylno == 0)
- for (ino = 0; ino < ROOTINO; ino++) {
+ for (ino = 0; ino < UFS_ROOTINO; ino++) {
setbit(cg_inosused(&acg), ino);
acg.cg_cs.cs_nifree--;
}