From 5275d9d01cfce568605fed9eb0d0a0d6963a7b3b Mon Sep 17 00:00:00 2001 From: bapt Date: Wed, 23 Dec 2015 10:20:46 +0000 Subject: 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 Reviewed by: mahrens Sponsored by: Gandi.net Differential Revision: https://reviews.freebsd.org/D4691 --- cddl/contrib/opensolaris/cmd/zdb/zdb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cddl') diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c index 7f25880..346d817 100644 --- a/cddl/contrib/opensolaris/cmd/zdb/zdb.c +++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.c @@ -3657,7 +3657,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); -- cgit v1.1