Date: Thu, 5 Jan 2012 10:02:05 -0800 From: David Wolfskill <david@catwhisker.org> To: FreeBSD Tinderbox <tinderbox@freebsd.org> Cc: stable@freebsd.org, i386@freebsd.org Subject: Re: [releng_8 tinderbox] failure on i386/i386 Message-ID: <20120105180205.GJ1733@albert.catwhisker.org> In-Reply-To: <201201051328.q05DSPAb012231@freebsd-legacy.sentex.ca> References: <201201051328.q05DSPAb012231@freebsd-legacy.sentex.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
--J3rqiH0DIeiRD2zz Content-Type: multipart/mixed; boundary="ZkK3DH7HIvxYLwhR" Content-Disposition: inline --ZkK3DH7HIvxYLwhR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 05, 2012 at 01:28:25PM +0000, FreeBSD Tinderbox wrote: > ... > cc -O2 -pipe -I/src/cddl/sbin/zpool/../../../cddl/contrib/opensolaris/li= b/libzpool/common -I/src/cddl/sbin/zpool/../../../cddl/compat/opensolaris/i= nclude -I/src/cddl/sbin/zpool/../../../cddl/compat/opensolaris/lib/libumem = -I/src/cddl/sbin/zpool/../../../sys/cddl/compat/opensolaris -I/src/cddl/sbi= n/zpool/../../../cddl/contrib/opensolaris/head -I/src/cddl/sbin/zpool/../..= /../cddl/contrib/opensolaris/lib/libuutil/common -I/src/cddl/sbin/zpool/../= ../../cddl/contrib/opensolaris/lib/libumem/common -I/src/cddl/sbin/zpool/..= /../../cddl/contrib/opensolaris/lib/libzfs/common -I/src/cddl/sbin/zpool/..= /../../cddl/contrib/opensolaris/lib/libnvpair -I/src/cddl/sbin/zpool/../../= ../sys/cddl/contrib/opensolaris/common/zfs -I/src/cddl/sbin/zpool/../../../= sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/sbin/zpool/../../../sys= /cddl/contrib/opensolaris/uts/common/fs/zfs -I/src/cddl/sbin/zpool/../../..= /sys/cddl/contrib/opensolaris/uts/common/sys -I/src/cddl/sbin/zpool/../../.= ./cddl/contrib/o! > pensolaris/lib/libzpool/common -I/src/cddl/sbin/zpool/../../../cddl/cont= rib/opensolaris/cmd/stat/common -DNEED_SOLARIS_BOOLEAN -std=3Dgnu89 -fstack= -protector -Wno-unknown-pragmas -o zpool zpool_main.o zpool_vdev.o zpool_i= ter.o zpool_util.o zfs_comutil.o timestamp.o -lavl -lbsdxml -lgeom -lm -lnv= pair -lsbuf -lumem -lutil -luutil -lzfs > zpool_main.o(.text+0x34fd): In function `zpool_do_labelclear': > : undefined reference to `zpool_pool_state_to_name' > *** Error code 1 > ... Attached patch gets around the above for me. Caveats: * I haven't finished the build yet (but did get beyond that breakage). * I don't use ZFS, so I don't exercise the code. Peace, david --=20 David H. Wolfskill david@catwhisker.org Depriving a girl or boy of an opportunity for education is evil. See http://www.catwhisker.org/~david/publickey.gpg for my public key. --ZkK3DH7HIvxYLwhR Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="stable_8.patch" Content-Transfer-Encoding: quoted-printable Index: cddl/contrib/opensolaris/lib/libzfs/common/libzfs.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 --- cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h (revision 229586) +++ cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h (working copy) @@ -202,7 +202,8 @@ extern void zpool_close(zpool_handle_t *); extern const char *zpool_get_name(zpool_handle_t *); extern int zpool_get_state(zpool_handle_t *); -extern char *zpool_state_to_name(vdev_state_t, vdev_aux_t); +extern const char *zpool_state_to_name(vdev_state_t, vdev_aux_t); +extern const char *zpool_pool_state_to_name(pool_state_t); extern void zpool_free_handles(libzfs_handle_t *); =20 /* Index: cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c =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 --- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c (revision 2295= 86) +++ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c (working copy) @@ -176,7 +176,7 @@ /* * Map VDEV STATE to printed strings. */ -char * +const char * zpool_state_to_name(vdev_state_t state, vdev_aux_t aux) { switch (state) { @@ -204,6 +204,34 @@ } =20 /* + * Map POOL STATE to printed strings. + */ +const char * +zpool_pool_state_to_name(pool_state_t state) +{ + switch (state) { + case POOL_STATE_ACTIVE: + return (gettext("ACTIVE")); + case POOL_STATE_EXPORTED: + return (gettext("EXPORTED")); + case POOL_STATE_DESTROYED: + return (gettext("DESTROYED")); + case POOL_STATE_SPARE: + return (gettext("SPARE")); + case POOL_STATE_L2CACHE: + return (gettext("L2CACHE")); + case POOL_STATE_UNINITIALIZED: + return (gettext("UNINITIALIZED")); + case POOL_STATE_UNAVAIL: + return (gettext("UNAVAIL")); + case POOL_STATE_POTENTIALLY_ACTIVE: + return (gettext("POTENTIALLY_ACTIVE")); + } + + return (gettext("UNKNOWN")); +} + +/* * Get a zpool property value for 'prop' and return the value in * a pre-allocated buffer. */ --ZkK3DH7HIvxYLwhR-- --J3rqiH0DIeiRD2zz Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk8F5ZwACgkQmprOCmdXAD0dkwCfUZ9yicWNgxyJmWlRkZuJIYRY 20YAmwQK8F5A+itUYPnLS61jjr7xMyDV =Fm/6 -----END PGP SIGNATURE----- --J3rqiH0DIeiRD2zz--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120105180205.GJ1733>