Received: by mail.netbsd.org (Postfix, from userid 605) id BC89B14A154; Tue, 18 Jun 2013 21:12:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 359A614A143 for ; Tue, 18 Jun 2013 21:12:30 +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 tncEMWIVLWXS for ; Tue, 18 Jun 2013 21:12:27 +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 EE35D14A844 for ; Tue, 18 Jun 2013 18:18:58 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id E73A696; Tue, 18 Jun 2013 18:18:58 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Tue, 18 Jun 2013 14:18:58 -0400 From: "Christos Zoulas" Subject: CVS commit: src To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20130618181858.E73A696@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: "Christos Zoulas" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: christos Date: Tue Jun 18 18:18:58 UTC 2013 Modified Files: src/libexec/lfs_cleanerd: coalesce.c fdfs.c lfs_cleanerd.c src/sbin/fsck_lfs: dir.c inode.c lfs.c pass1.c pass4.c pass5.c pass6.c segwrite.c setup.c src/sbin/newfs_lfs: make_lfs.c newfs.c src/sys/arch/hp700/stand/xxboot: readufs.h src/sys/arch/x68k/stand/boot_ufs: readufs.h readufs_lfs.c src/sys/lib/libsa: lfsv1.c lfsv2.c src/sys/ufs/lfs: lfs.h lfs_alloc.c lfs_balloc.c lfs_bio.c lfs_debug.c lfs_inode.c lfs_rfw.c lfs_segment.c lfs_subr.c lfs_syscalls.c lfs_vfsops.c lfs_vnops.c ulfs_inode.h ulfs_lookup.c ulfs_readwrite.c src/usr.sbin/dumplfs: dumplfs.c Log Message: Prefix most of the cpp macros with lfs_ and LFS_ to avoid conflicts with ffs. This was done so that boot blocks that want to compile both FFS and LFS in the same file work. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/libexec/lfs_cleanerd/coalesce.c cvs rdiff -u -r1.9 -r1.10 src/libexec/lfs_cleanerd/fdfs.c cvs rdiff -u -r1.35 -r1.36 src/libexec/lfs_cleanerd/lfs_cleanerd.c cvs rdiff -u -r1.31 -r1.32 src/sbin/fsck_lfs/dir.c cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_lfs/inode.c cvs rdiff -u -r1.39 -r1.40 src/sbin/fsck_lfs/lfs.c cvs rdiff -u -r1.36 -r1.37 src/sbin/fsck_lfs/pass1.c cvs rdiff -u -r1.21 -r1.22 src/sbin/fsck_lfs/pass4.c cvs rdiff -u -r1.27 -r1.28 src/sbin/fsck_lfs/pass5.c cvs rdiff -u -r1.30 -r1.31 src/sbin/fsck_lfs/pass6.c cvs rdiff -u -r1.25 -r1.26 src/sbin/fsck_lfs/segwrite.c cvs rdiff -u -r1.43 -r1.44 src/sbin/fsck_lfs/setup.c cvs rdiff -u -r1.27 -r1.28 src/sbin/newfs_lfs/make_lfs.c cvs rdiff -u -r1.28 -r1.29 src/sbin/newfs_lfs/newfs.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/stand/xxboot/readufs.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x68k/stand/boot_ufs/readufs.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c cvs rdiff -u -r1.6 -r1.7 src/sys/lib/libsa/lfsv1.c src/sys/lib/libsa/lfsv2.c cvs rdiff -u -r1.153 -r1.154 src/sys/ufs/lfs/lfs.h cvs rdiff -u -r1.116 -r1.117 src/sys/ufs/lfs/lfs_alloc.c cvs rdiff -u -r1.76 -r1.77 src/sys/ufs/lfs/lfs_balloc.c cvs rdiff -u -r1.124 -r1.125 src/sys/ufs/lfs/lfs_bio.c cvs rdiff -u -r1.42 -r1.43 src/sys/ufs/lfs/lfs_debug.c cvs rdiff -u -r1.131 -r1.132 src/sys/ufs/lfs/lfs_inode.c cvs rdiff -u -r1.16 -r1.17 src/sys/ufs/lfs/lfs_rfw.c cvs rdiff -u -r1.229 -r1.230 src/sys/ufs/lfs/lfs_segment.c cvs rdiff -u -r1.78 -r1.79 src/sys/ufs/lfs/lfs_subr.c cvs rdiff -u -r1.146 -r1.147 src/sys/ufs/lfs/lfs_syscalls.c cvs rdiff -u -r1.306 -r1.307 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.247 -r1.248 src/sys/ufs/lfs/lfs_vnops.c cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/lfs/ulfs_inode.h cvs rdiff -u -r1.11 -r1.12 src/sys/ufs/lfs/ulfs_lookup.c cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/lfs/ulfs_readwrite.c cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/dumplfs/dumplfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.