From owner-svn-src-stable-10@freebsd.org Sun Mar 20 23:47:09 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09FE9AD6F9B; Sun, 20 Mar 2016 23:47:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C3D111AF; Sun, 20 Mar 2016 23:47:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:7b8:3a7::dcc4:5155:4638:d6bf] (unknown [IPv6:2001:7b8:3a7:0:dcc4:5155:4638:d6bf]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 4605723663; Mon, 21 Mar 2016 00:47:05 +0100 (CET) Subject: Re: svn commit: r297089 - stable/10/cddl/contrib/opensolaris/cmd/zdb Mime-Version: 1.0 (Mac OS X Mail 9.2 \(3112\)) Content-Type: multipart/signed; boundary="Apple-Mail=_B51142F1-5EB2-450C-B7E0-987AD419B6C5"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.6b2 (ebbf3ef) From: Dimitry Andric In-Reply-To: <201603202329.u2KNTwSs018607@repo.freebsd.org> Date: Mon, 21 Mar 2016 00:47:04 +0100 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Message-Id: <603EBC56-4354-4B9F-AA60-0496DBF3EBF7@FreeBSD.org> References: <201603202329.u2KNTwSs018607@repo.freebsd.org> To: Alexander Motin X-Mailer: Apple Mail (2.3112) X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Mar 2016 23:47:09 -0000 --Apple-Mail=_B51142F1-5EB2-450C-B7E0-987AD419B6C5 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 21 Mar 2016, at 00:29, Alexander Motin wrote: > Author: mav > Date: Sun Mar 20 23:29:58 2016 > New Revision: 297089 > URL: https://svnweb.freebsd.org/changeset/base/297089 >=20 > Log: > MFC r292653 (by bapt): Report an error if zdb cannot initialize zfs >=20 > If the zfs module is not present and not loadable, report an error > to the user instead of crashing >=20 > Differential Revision: https://reviews.freebsd.org/D4691 >=20 > Modified: > stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c > Directory Properties: > stable/10/ (props changed) >=20 > Modified: stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sun Mar 20 = 23:26:52 2016 (r297088) > +++ stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sun Mar 20 = 23:29:58 2016 (r297089) > @@ -3658,7 +3658,8 @@ main(int argc, char **argv) >=20 > kernel_init(FREAD); > g_zfs =3D libzfs_init(); > - ASSERT(g_zfs !=3D NULL); > + if (g_zfs =3D=3D NULL) > + fatal("Fail to initialize zfs"); Minor nit: "Failed to" or "Unable to" is probably better here. -Dimitry --Apple-Mail=_B51142F1-5EB2-450C-B7E0-987AD419B6C5 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.29 iEYEARECAAYFAlbvNngACgkQsF6jCi4glqPliwCdEmRDS9RWotYMqJCuEduurAyT 1XwAoMG+kAp5Qm7K+t8TgU0KgSBcjrTp =sILT -----END PGP SIGNATURE----- --Apple-Mail=_B51142F1-5EB2-450C-B7E0-987AD419B6C5--