Date: Sun, 20 Mar 2016 23:29:58 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r297089 - stable/10/cddl/contrib/opensolaris/cmd/zdb Message-ID: <201603202329.u2KNTwSs018607@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Sun Mar 20 23:29:58 2016 New Revision: 297089 URL: https://svnweb.freebsd.org/changeset/base/297089 Log: MFC r292653 (by bapt): Report an error if zdb cannot initialize zfs If the zfs module is not present and not loadable, report an error to the user instead of crashing Differential Revision: https://reviews.freebsd.org/D4691 Modified: stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- 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) kernel_init(FREAD); g_zfs = libzfs_init(); - ASSERT(g_zfs != NULL); + if (g_zfs == NULL) + fatal("Fail to initialize zfs"); if (dump_all) verbose = MAX(verbose, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603202329.u2KNTwSs018607>