Merge branch 'fix-branch' into refs/top-bases/zfs-branch
This commit is contained in:
commit
b8245db563
|
@ -52,7 +52,6 @@
|
||||||
#include <sys/zfs_fuid.h>
|
#include <sys/zfs_fuid.h>
|
||||||
#include <sys/arc.h>
|
#include <sys/arc.h>
|
||||||
#undef ZFS_MAXNAMELEN
|
#undef ZFS_MAXNAMELEN
|
||||||
#undef verify
|
|
||||||
#include <libzfs.h>
|
#include <libzfs.h>
|
||||||
|
|
||||||
const char cmdname[] = "zdb";
|
const char cmdname[] = "zdb";
|
||||||
|
|
Loading…
Reference in New Issue