From owner-svn-src-all@FreeBSD.ORG Mon Aug 6 23:17:04 2012 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 78B591065670; Mon, 6 Aug 2012 23:17:04 +0000 (UTC) (envelope-from peter@rulingia.com) Received: from vps.rulingia.com (host-122-100-2-194.octopus.com.au [122.100.2.194]) by mx1.freebsd.org (Postfix) with ESMTP id E03568FC0C; Mon, 6 Aug 2012 23:17:03 +0000 (UTC) Received: from server.rulingia.com (c220-239-247-45.belrs5.nsw.optusnet.com.au [220.239.247.45]) by vps.rulingia.com (8.14.5/8.14.5) with ESMTP id q76NGupA044145 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 7 Aug 2012 09:16:56 +1000 (EST) (envelope-from peter@rulingia.com) X-Bogosity: Ham, spamicity=0.000000 Received: from server.rulingia.com (localhost.rulingia.com [127.0.0.1]) by server.rulingia.com (8.14.5/8.14.5) with ESMTP id q76NGiFn094781 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 7 Aug 2012 09:16:44 +1000 (EST) (envelope-from peter@server.rulingia.com) Received: (from peter@localhost) by server.rulingia.com (8.14.5/8.14.5/Submit) id q76NGh1l094776; Tue, 7 Aug 2012 09:16:43 +1000 (EST) (envelope-from peter) Date: Tue, 7 Aug 2012 09:16:43 +1000 From: Peter Jeremy To: Marius Strobl Message-ID: <20120806231643.GA25854@server.rulingia.com> References: <201208052019.q75KJSkY022376@svn.freebsd.org> <20120805202540.GH2676@deviant.kiev.zoral.com.ua> <20120805205246.GW58433@alchemy.franken.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="YZ5djTAD1cGYuMQK" Content-Disposition: inline In-Reply-To: <20120805205246.GW58433@alchemy.franken.de> X-PGP-Key: http://www.rulingia.com/keys/peter.pgp User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Konstantin Belousov , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r239077 - head/sys/cddl/contrib/opensolaris/uts/common/fs/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: Mon, 06 Aug 2012 23:17:04 -0000 --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2012-Aug-05 22:52:46 +0200, Marius Strobl wrote: >Bascially, "options ZFS" is available on at least amd64, i386, pc98, >powerpc64 and sparc64. At least in theory. In practise, it's not usable because: >powerpc). However, this causes linking the kernel to fail due to some >symbols being defined multiple times: =2E.. >I currently can't remember the details but the fix seemed non-trivial >to me, short of creating something like LINT-ZFS kernel config files >similar to the LINT-VIMAGE etc we have. The underlying problem is that there are 2 zlib's in the kernel tree. One is in sys/cddl/contrib/opensolaris/uts/common/zmod/ and the other is sys/net/zlib.c. The real fix is to get rid of one of them and use the remaining one for all subsystems that want zlib. I agree that merging them is non-trivial because they are based on different versions of zlib (1.2.3 & 1.0.4, respectively) and the original files have been munged is different ways. (And there's a third inflate(9) based on unzip-5.12 in sys/kern/inflate.c, as well as another complete zlib-1.2.7 in lib/libz) --=20 Peter Jeremy --YZ5djTAD1cGYuMQK Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlAgUFsACgkQ/opHv/APuIdITACdFOcCILSaKfHRKUXW487HjUNI Q+gAoKFWWeN4IysmPXz/0j0aC2AJJvBV =8xM/ -----END PGP SIGNATURE----- --YZ5djTAD1cGYuMQK--