From owner-svn-src-all@FreeBSD.ORG Sat Mar 23 00:00:13 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4A4469A1; Sat, 23 Mar 2013 00:00:13 +0000 (UTC) (envelope-from seanwbruno@gmail.com) Received: from mail-pd0-f169.google.com (mail-pd0-f169.google.com [209.85.192.169]) by mx1.freebsd.org (Postfix) with ESMTP id 1696CB44; Sat, 23 Mar 2013 00:00:12 +0000 (UTC) Received: by mail-pd0-f169.google.com with SMTP id 3so1868982pdj.28 for ; Fri, 22 Mar 2013 17:00:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:subject:from:reply-to:to:cc:in-reply-to:references :content-type:date:message-id:mime-version:x-mailer; bh=QltWwBFTsp4aX86uDuOHl9wmmVx4wjlAjIFSzne8NvU=; b=WCVoeEsySkkzVlsIG+xDVjgd1NShWl4PchyXiYmpUrPlcZYd4wRsknI5qCVJ8hffSk 4pWKc87j+eCbTaV1bIUY4bKentvD5j8ew0KPrDRb3S9Eeq5lfa+HeUw1Nil78lUEoB7S tX8oLZE8uWsdN0jUEaWBtz4h07TJj7NVMoqfvUUrPD53sNfH4Omdkjaqq9M4OGH4UGlV 7c/hTcI9Tnqc6BiXXHzATcd5eNnkLpaGHflhIvdCkWrX+nFOU6+dRmapDAPf1Zbj1ngY ERTdWbeZ3Vjust84WNEeVBRfYM4MOtfAA+XKozlEWDnr8NRnAMmfWmX6TOP9imTSO0OG OM8g== X-Received: by 10.66.252.202 with SMTP id zu10mr6058583pac.75.1363996812576; Fri, 22 Mar 2013 17:00:12 -0700 (PDT) Received: from [10.73.160.242] (nat-dip7.cfw-a-gci.corp.yahoo.com. [209.131.62.116]) by mx.google.com with ESMTPS id qp13sm4015173pbb.3.2013.03.22.17.00.10 (version=SSLv3 cipher=RC4-SHA bits=128/128); Fri, 22 Mar 2013 17:00:11 -0700 (PDT) Subject: Re: svn commit: r248625 - head/sbin/fsck_ffs From: Sean Bruno To: Kirk McKusick In-Reply-To: <201303222150.r2MLoibe044748@svn.freebsd.org> References: <201303222150.r2MLoibe044748@svn.freebsd.org> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-EiqsU22rzNcc/Zza4QVn" Date: Fri, 22 Mar 2013 17:00:09 -0700 Message-ID: <1363996809.2270.20.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: sbruno@freebsd.org List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Mar 2013 00:00:13 -0000 --=-EiqsU22rzNcc/Zza4QVn Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This completely breaks sbin/fsdb ...=20 Warning: Object directory not changed from original /home/sbruno/bsd/head/sbin/fsdb cc -O2 -pipe -I/home/sbruno/bsd/head/sbin/fsdb/../fsck_ffs -std=3Dgnu99 -Qunused-arguments -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-conversion -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -c fsdb.c fsdb.c:444:23: error: use of undeclared identifier 'cgrp'; did you mean 'cgp'? struct cg *cgp =3D &cgrp; ^~~~ cgp fsdb.c:444:16: note: 'cgp' declared here struct cg *cgp =3D &cgrp; ^ fsdb.c:444:16: error: incompatible pointer types initializing 'struct cg *' with an expression of type 'struct cg **'; remove & [-Werror,-Wincompatible-pointer-types] struct cg *cgp =3D &cgrp; ^ ~~~~~ fsdb.c:476:10: error: use of undeclared identifier 'cgblk' getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); ^ fsdb.c:477:14: error: use of undeclared identifier 'cgblk' memcpy(cgp, cgblk.b_un.b_cg, sblock.fs_cgsize); ^ 4 errors generated. *** [fsdb.o] Error code 1 On Fri, 2013-03-22 at 21:50 +0000, Kirk McKusick wrote: > Modified: head/sbin/fsck_ffs/fsck.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sbin/fsck_ffs/fsck.h Fri Mar 22 21:50:32 > 2013 (r248624) > +++ head/sbin/fsck_ffs/fsck.h Fri Mar 22 21:50:43 > 2013 (r248625) > @@ -198,7 +198,6 @@ struct timespec totalreadtime[BT_NUMBUFT > struct timespec startprog; > =20 > struct bufarea sblk; /* file system superblock */ > -struct bufarea cgblk; /* cylinder group blocks */ > struct bufarea *pdirbp; /* current directory contents > */ > struct bufarea *pbp; /* current inode block */ > =20 > @@ -216,9 +215,7 @@ struct bufarea *pbp; /* current > inode b > } while (0) > =20 > #define sbdirty() dirty(&sblk) > -#define cgdirty() dirty(&cgblk) > #define sblock (*sblk.b_un.b_fs) > -#define cgrp (*cgblk.b_un.b_cg)=20 --=-EiqsU22rzNcc/Zza4QVn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAABAgAGBQJRTPCJAAoJEBkJRdwI6BaHx2UH/3oUXC3O/hzfnbeD4Shh9Yis 3ETvg61nt1ZSX4Z35RTYjQA36rR87PH5FP9ZhymuCEsYWtRLfpffEQfOX0F/KG/0 RS+L1xCGeLA/3oqHZ26r6WJtY7pEaJvu7NYHamaOqosmvd8H4YLLpBS/4n/rkq6T DPGgbSR2oNUfPzZyWhWBggFwmkLKMBIdolE1BXrP/lEi1CRYUFMonvbv4QWeL2bj n7pykq5GPyErbgvrU4DOgoqbn54NZD8tBEuH2cS494YidHlUCVy8DEOyYzHTkj2V fSCnB8i4LEruI2YjduQQ/LDYi210/lMMi0DFIAIuOlOUkKXXPHjqQKmgK9McVv0= =L3iS -----END PGP SIGNATURE----- --=-EiqsU22rzNcc/Zza4QVn--