diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-12-23 10:20:46 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-12-23 10:20:46 +0000 |
| commit | 9cd69d502ca3d2b0244b2e399962614e3cb66689 (patch) | |
| tree | 7ba9fb8bd302b29dff95376b3b276d29afe7826c /cddl/contrib | |
| parent | 013829494eb3796b9ba9e6963dac4407f0a4b8dd (diff) | |
| download | src-9cd69d502ca3d2b0244b2e399962614e3cb66689.tar.gz src-9cd69d502ca3d2b0244b2e399962614e3cb66689.zip | |
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
Notes
Notes:
svn path=/head/; revision=292653
Diffstat (limited to 'cddl/contrib')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zdb/zdb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c index 7f2588021bd5..346d817f3e86 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); |