From owner-svn-src-all@FreeBSD.ORG Fri Sep 10 03:25:46 2010 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82FCC106564A; Fri, 10 Sep 2010 03:25:46 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.freebsd.org (Postfix) with ESMTP id 0C2E68FC1D; Fri, 10 Sep 2010 03:25:45 +0000 (UTC) X-Spam-Status: No X-Hellug-MailScanner-From: keramida@ceid.upatras.gr X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.001, required 5, autolearn=not spam, ALL_TRUSTED -1.00, BAYES_20 -0.00) X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-ID: o8A3DRVg000389 Received: from kobe.laptop (79.103.63.75.dsl.dyn.forthnet.gr [79.103.63.75]) (authenticated bits=128) by igloo.linux.gr (8.14.3/8.14.3/Debian-9.2) with ESMTP id o8A3DRVg000389 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 10 Sep 2010 06:13:34 +0300 Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.4/8.14.4) with ESMTP id o8A3DMHn070977 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 10 Sep 2010 06:13:22 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) Received: (from keramida@localhost) by kobe.laptop (8.14.4/8.14.4/Submit) id o8A3DLDw070974; Fri, 10 Sep 2010 06:13:21 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) From: Giorgos Keramidas To: Pawel Jakub Dawidek References: <201009092119.o89LJA4H034431@svn.freebsd.org> Date: Fri, 10 Sep 2010 06:13:21 +0300 In-Reply-To: <201009092119.o89LJA4H034431@svn.freebsd.org> (Pawel Jakub Dawidek's message of "Thu, 9 Sep 2010 21:19:10 +0000 (UTC)") Message-ID: <8762yeqoj2.fsf@kobe.laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r212384 - head/sys/boot/zfs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list 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: Fri, 10 Sep 2010 03:25:46 -0000 On Thu, 9 Sep 2010 21:19:10 +0000 (UTC), Pawel Jakub Dawidek wrote: > Author: pjd > Date: Thu Sep 9 21:19:09 2010 > New Revision: 212384 > URL: http://svn.freebsd.org/changeset/base/212384 > > Log: > Ignore log vdevs. > > MFC after: 2 weeks > --- head/sys/boot/zfs/zfsimpl.c Thu Sep 9 21:18:00 2010 (r212383) > +++ head/sys/boot/zfs/zfsimpl.c Thu Sep 9 21:19:09 2010 (r212384) > @@ -849,6 +850,12 @@ vdev_probe(vdev_phys_read_t *read, void > return (EIO); > } > > + is_log = 0; > + (void) nvlist_find(nvlist, ZPOOL_CONFIG_IS_LOG, DATA_TYPE_UINT64, 0, > + &is_log); > + if (is_log) > + return (EIO); > + ZPOOL_CONFIG_IS_LOG is not visible in zfsimpl.c and it breaks the build here with: /usr/src/sys/boot/zfs/zfsimpl.c: In function 'vdev_probe': /usr/src/sys/boot/zfs/zfsimpl.c:853: error: 'ZPOOL_CONFIG_IS_LOG' undeclared (first use in this function) /usr/src/sys/boot/zfs/zfsimpl.c:853: error: (Each undeclared identifier is reported only once /usr/src/sys/boot/zfs/zfsimpl.c:853: error: for each function it appears in.) It looks like we have to resync the ZFS_CONFIG_XXX defines from zfs.h to zfsimpl.h to make this buildable again: %%% diff -r 561815530ad6 sys/cddl/boot/zfs/zfsimpl.h --- a/sys/cddl/boot/zfs/zfsimpl.h Fri May 07 22:51:07 2010 +0300 +++ b/sys/cddl/boot/zfs/zfsimpl.h Fri Sep 10 06:13:11 2010 +0300 @@ -546,17 +546,23 @@ #define ZPOOL_CONFIG_NPARITY "nparity" #define ZPOOL_CONFIG_HOSTID "hostid" #define ZPOOL_CONFIG_HOSTNAME "hostname" -#define ZPOOL_CONFIG_TIMESTAMP "timestamp" /* not stored on disk */ - +#define ZPOOL_CONFIG_UNSPARE "unspare" +#define ZPOOL_CONFIG_PHYS_PATH "phys_path" +#define ZPOOL_CONFIG_IS_LOG "is_log" +#define ZPOOL_CONFIG_L2CACHE "l2cache" +#define ZPOOL_CONFIG_SUSPENDED "suspended" /* not stored on disk */ +#define ZPOOL_CONFIG_TIMESTAMP "timestamp" /* not stored on disk */ +#define ZPOOL_CONFIG_BOOTFS "bootfs" /* not stored on disk */ /* * The persistent vdev state is stored as separate values rather than a single * 'vdev_state' entry. This is because a device can be in multiple states, such * as offline and degraded. */ -#define ZPOOL_CONFIG_OFFLINE "offline" -#define ZPOOL_CONFIG_FAULTED "faulted" -#define ZPOOL_CONFIG_DEGRADED "degraded" -#define ZPOOL_CONFIG_REMOVED "removed" +#define ZPOOL_CONFIG_OFFLINE "offline" +#define ZPOOL_CONFIG_FAULTED "faulted" +#define ZPOOL_CONFIG_DEGRADED "degraded" +#define ZPOOL_CONFIG_REMOVED "removed" +#define ZPOOL_CONFIG_FRU "fru" #define VDEV_TYPE_ROOT "root" #define VDEV_TYPE_MIRROR "mirror" %%%