Received: by mail.netbsd.org (Postfix, from userid 605) id BE95814A2DA; Tue, 22 Jan 2013 09:39:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E9D5B14A2D8 for ; Tue, 22 Jan 2013 09:39:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id qsg0Fulj8V4a for ; Tue, 22 Jan 2013 09:39:22 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id A32C614A2C8 for ; Tue, 22 Jan 2013 09:39:22 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 9A849175DD; Tue, 22 Jan 2013 09:39:22 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Tue, 22 Jan 2013 09:39:22 +0000 From: "David A. Holland" Subject: CVS commit: src To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20130122093922.9A849175DD@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "David A. Holland" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: dholland Date: Tue Jan 22 09:39:20 UTC 2013 Modified Files: src/libexec/lfs_cleanerd: coalesce.c lfs_cleanerd.c src/sbin/dump: dump.h ffs_inode.c traverse.c src/sbin/dump_lfs: lfs_inode.c src/sbin/fsck_ext2fs: dir.c inode.c pass1.c setup.c src/sbin/fsck_ffs: dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c pass5.c setup.c utilities.c src/sbin/fsck_lfs: dir.c inode.c lfs.c pass0.c pass1.c pass2.c pass3.c pass4.c pass6.c segwrite.c setup.c utilities.c src/sbin/fsdb: fsdb.c src/sbin/newfs: mkfs.c src/sbin/newfs_ext2fs: mke2fs.c src/sbin/newfs_lfs: make_lfs.c src/sbin/resize_ffs: resize_ffs.c src/sbin/restore: dirs.c interactive.c main.c restore.c symtab.c tape.c utilities.c src/sys/arch/hp700/stand/xxboot: readufs.c src/sys/arch/mvme68k/stand/installboot: installboot.c src/sys/arch/sparc/stand/bootblk: genfth.cf src/sys/arch/x68k/stand/boot_ufs: readufs.c src/sys/lib/libsa: ext2fs.c ufs.c src/sys/nfs: nfs_vfsops.c src/sys/ufs/chfs: chfs_inode.h chfs_vfsops.c chfs_vnops.c src/sys/ufs/ext2fs: ext2fs_balloc.c ext2fs_bmap.c ext2fs_bswap.c ext2fs_dinode.h ext2fs_inode.c ext2fs_lookup.c ext2fs_rename.c ext2fs_vnops.c src/sys/ufs/ffs: ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_inode.c ffs_snapshot.c ffs_vfsops.c ffs_vnops.c ffs_wapbl.c fs.h src/sys/ufs/lfs: lfs.h lfs_alloc.c lfs_balloc.c lfs_debug.c lfs_inode.c lfs_rfw.c lfs_segment.c lfs_syscalls.c lfs_vfsops.c lfs_vnops.c src/sys/ufs/ufs: dinode.h ufs_bmap.c ufs_inode.c ufs_lookup.c ufs_readwrite.c ufs_rename.c ufs_vfsops.c ufs_vnops.c src/usr.sbin/dumplfs: dumplfs.c src/usr.sbin/installboot: ext2fs.c ffs.c src/usr.sbin/makefs: ffs.c src/usr.sbin/makefs/ffs: ffs_alloc.c ffs_balloc.c mkfs.c ufs_bmap.c src/usr.sbin/quot: quot.c src/usr.sbin/quotacheck: quotacheck.c Log Message: Stuff UFS_ in front of a few of ufs's symbols to reduce namespace pollution. Specifically: ROOTINO -> UFS_ROOTINO WINO -> UFS_WINO NXADDR -> UFS_NXADDR NDADDR -> UFS_NDADDR NIADDR -> UFS_NIADDR MAXSYMLINKLEN -> UFS_MAXSYMLINKLEN MAXSYMLINKLEN_UFS[12] -> UFS[12]_MAXSYMLINKLEN (for consistency) Sort out ext2fs's misuse of NDADDR and NIADDR; fortunately, these have the same values in ext2fs and ffs. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/libexec/lfs_cleanerd/coalesce.c cvs rdiff -u -r1.31 -r1.32 src/libexec/lfs_cleanerd/lfs_cleanerd.c cvs rdiff -u -r1.49 -r1.50 src/sbin/dump/dump.h cvs rdiff -u -r1.19 -r1.20 src/sbin/dump/ffs_inode.c cvs rdiff -u -r1.48 -r1.49 src/sbin/dump/traverse.c cvs rdiff -u -r1.15 -r1.16 src/sbin/dump_lfs/lfs_inode.c cvs rdiff -u -r1.25 -r1.26 src/sbin/fsck_ext2fs/dir.c cvs rdiff -u -r1.32 -r1.33 src/sbin/fsck_ext2fs/inode.c cvs rdiff -u -r1.22 -r1.23 src/sbin/fsck_ext2fs/pass1.c cvs rdiff -u -r1.28 -r1.29 src/sbin/fsck_ext2fs/setup.c cvs rdiff -u -r1.53 -r1.54 src/sbin/fsck_ffs/dir.c cvs rdiff -u -r1.64 -r1.65 src/sbin/fsck_ffs/inode.c cvs rdiff -u -r1.80 -r1.81 src/sbin/fsck_ffs/main.c cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_ffs/pass1.c \ src/sbin/fsck_ffs/pass5.c cvs rdiff -u -r1.22 -r1.23 src/sbin/fsck_ffs/pass1b.c cvs rdiff -u -r1.48 -r1.49 src/sbin/fsck_ffs/pass2.c cvs rdiff -u -r1.20 -r1.21 src/sbin/fsck_ffs/pass3.c cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck_ffs/pass4.c cvs rdiff -u -r1.95 -r1.96 src/sbin/fsck_ffs/setup.c cvs rdiff -u -r1.60 -r1.61 src/sbin/fsck_ffs/utilities.c cvs rdiff -u -r1.25 -r1.26 src/sbin/fsck_lfs/dir.c cvs rdiff -u -r1.42 -r1.43 src/sbin/fsck_lfs/inode.c cvs rdiff -u -r1.35 -r1.36 src/sbin/fsck_lfs/lfs.c cvs rdiff -u -r1.31 -r1.32 src/sbin/fsck_lfs/pass0.c \ src/sbin/fsck_lfs/utilities.c cvs rdiff -u -r1.30 -r1.31 src/sbin/fsck_lfs/pass1.c cvs rdiff -u -r1.17 -r1.18 src/sbin/fsck_lfs/pass2.c \ src/sbin/fsck_lfs/pass4.c cvs rdiff -u -r1.9 -r1.10 src/sbin/fsck_lfs/pass3.c cvs rdiff -u -r1.24 -r1.25 src/sbin/fsck_lfs/pass6.c cvs rdiff -u -r1.20 -r1.21 src/sbin/fsck_lfs/segwrite.c cvs rdiff -u -r1.38 -r1.39 src/sbin/fsck_lfs/setup.c cvs rdiff -u -r1.44 -r1.45 src/sbin/fsdb/fsdb.c cvs rdiff -u -r1.112 -r1.113 src/sbin/newfs/mkfs.c cvs rdiff -u -r1.16 -r1.17 src/sbin/newfs_ext2fs/mke2fs.c cvs rdiff -u -r1.19 -r1.20 src/sbin/newfs_lfs/make_lfs.c cvs rdiff -u -r1.33 -r1.34 src/sbin/resize_ffs/resize_ffs.c cvs rdiff -u -r1.48 -r1.49 src/sbin/restore/dirs.c cvs rdiff -u -r1.26 -r1.27 src/sbin/restore/interactive.c cvs rdiff -u -r1.34 -r1.35 src/sbin/restore/main.c cvs rdiff -u -r1.20 -r1.21 src/sbin/restore/restore.c cvs rdiff -u -r1.28 -r1.29 src/sbin/restore/symtab.c cvs rdiff -u -r1.66 -r1.67 src/sbin/restore/tape.c cvs rdiff -u -r1.22 -r1.23 src/sbin/restore/utilities.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp700/stand/xxboot/readufs.c cvs rdiff -u -r1.15 -r1.16 \ src/sys/arch/mvme68k/stand/installboot/installboot.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/stand/bootblk/genfth.cf cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x68k/stand/boot_ufs/readufs.c cvs rdiff -u -r1.13 -r1.14 src/sys/lib/libsa/ext2fs.c cvs rdiff -u -r1.58 -r1.59 src/sys/lib/libsa/ufs.c cvs rdiff -u -r1.220 -r1.221 src/sys/nfs/nfs_vfsops.c cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/chfs/chfs_inode.h \ src/sys/ufs/chfs/chfs_vfsops.c cvs rdiff -u -r1.13 -r1.14 src/sys/ufs/chfs/chfs_vnops.c cvs rdiff -u -r1.36 -r1.37 src/sys/ufs/ext2fs/ext2fs_balloc.c cvs rdiff -u -r1.25 -r1.26 src/sys/ufs/ext2fs/ext2fs_bmap.c \ src/sys/ufs/ext2fs/ext2fs_dinode.h cvs rdiff -u -r1.18 -r1.19 src/sys/ufs/ext2fs/ext2fs_bswap.c cvs rdiff -u -r1.77 -r1.78 src/sys/ufs/ext2fs/ext2fs_inode.c cvs rdiff -u -r1.72 -r1.73 src/sys/ufs/ext2fs/ext2fs_lookup.c cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/ext2fs/ext2fs_rename.c cvs rdiff -u -r1.105 -r1.106 src/sys/ufs/ext2fs/ext2fs_vnops.c cvs rdiff -u -r1.132 -r1.133 src/sys/ufs/ffs/ffs_alloc.c cvs rdiff -u -r1.55 -r1.56 src/sys/ufs/ffs/ffs_balloc.c cvs rdiff -u -r1.35 -r1.36 src/sys/ufs/ffs/ffs_bswap.c cvs rdiff -u -r1.111 -r1.112 src/sys/ufs/ffs/ffs_inode.c cvs rdiff -u -r1.120 -r1.121 src/sys/ufs/ffs/ffs_snapshot.c cvs rdiff -u -r1.281 -r1.282 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.121 -r1.122 src/sys/ufs/ffs/ffs_vnops.c cvs rdiff -u -r1.18 -r1.19 src/sys/ufs/ffs/ffs_wapbl.c cvs rdiff -u -r1.59 -r1.60 src/sys/ufs/ffs/fs.h cvs rdiff -u -r1.136 -r1.137 src/sys/ufs/lfs/lfs.h cvs rdiff -u -r1.112 -r1.113 src/sys/ufs/lfs/lfs_alloc.c cvs rdiff -u -r1.71 -r1.72 src/sys/ufs/lfs/lfs_balloc.c cvs rdiff -u -r1.39 -r1.40 src/sys/ufs/lfs/lfs_debug.c cvs rdiff -u -r1.126 -r1.127 src/sys/ufs/lfs/lfs_inode.c cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/lfs/lfs_rfw.c cvs rdiff -u -r1.224 -r1.225 src/sys/ufs/lfs/lfs_segment.c cvs rdiff -u -r1.143 -r1.144 src/sys/ufs/lfs/lfs_syscalls.c cvs rdiff -u -r1.297 -r1.298 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.242 -r1.243 src/sys/ufs/lfs/lfs_vnops.c cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/ufs/dinode.h cvs rdiff -u -r1.49 -r1.50 src/sys/ufs/ufs/ufs_bmap.c cvs rdiff -u -r1.88 -r1.89 src/sys/ufs/ufs/ufs_inode.c cvs rdiff -u -r1.121 -r1.122 src/sys/ufs/ufs/ufs_lookup.c cvs rdiff -u -r1.104 -r1.105 src/sys/ufs/ufs/ufs_readwrite.c cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/ufs/ufs_rename.c cvs rdiff -u -r1.51 -r1.52 src/sys/ufs/ufs/ufs_vfsops.c cvs rdiff -u -r1.210 -r1.211 src/sys/ufs/ufs/ufs_vnops.c cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/dumplfs/dumplfs.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/installboot/ext2fs.c cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/installboot/ffs.c cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/makefs/ffs.c cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/makefs/ffs/ffs_alloc.c cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/makefs/ffs/ffs_balloc.c cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/makefs/ffs/mkfs.c cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makefs/ffs/ufs_bmap.c cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/quot/quot.c cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/quotacheck/quotacheck.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.