git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove spl/zfs modules as part of cleanup
[zfs.git]
/
cmd
/
zdb
/
zdb.c
diff --git
a/cmd/zdb/zdb.c
b/cmd/zdb/zdb.c
index
459445b
..
a5ad7fe
100644
(file)
--- a/
cmd/zdb/zdb.c
+++ b/
cmd/zdb/zdb.c
@@
-55,7
+55,6
@@
#include <sys/arc.h>
#include <sys/ddt.h>
#undef ZFS_MAXNAMELEN
#include <sys/arc.h>
#include <sys/ddt.h>
#undef ZFS_MAXNAMELEN
-#undef verify
#include <libzfs.h>
#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
#include <libzfs.h>
#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
@@
-3037,8
+3036,8
@@
main(int argc, char **argv)
}
kernel_init(FREAD);
}
kernel_init(FREAD);
- g_zfs = libzfs_init();
-
ASSERT(g_zfs != NULL
);
+ if ((g_zfs = libzfs_init()) == NULL)
+
return (1
);
if (dump_all)
verbose = MAX(verbose, 1);
if (dump_all)
verbose = MAX(verbose, 1);