Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
This commit is contained in:
commit
3b79eba6d7
|
@ -2395,7 +2395,7 @@ main(int argc, char **argv)
|
|||
|
||||
kernel_init(FREAD);
|
||||
g_zfs = libzfs_init();
|
||||
VERIFY(g_zfs != NULL);
|
||||
ASSERT(g_zfs != NULL);
|
||||
|
||||
for (c = 0; c < 256; c++) {
|
||||
if (dump_all && c != 'l' && c != 'R')
|
||||
|
|
|
@ -39,7 +39,6 @@
|
|||
#include <sys/mntent.h>
|
||||
#include <sys/mnttab.h>
|
||||
#include <sys/avl.h>
|
||||
#include <sys/debug.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include <libzfs.h>
|
||||
|
|
|
@ -579,8 +579,6 @@ libzfs_init(void)
|
|||
}
|
||||
|
||||
if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
|
||||
(void) fprintf(stderr, "Unable to open %s: (%d) %s\n",
|
||||
ZFS_DEV, errno, strerror(errno));
|
||||
free(hdl);
|
||||
return (NULL);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue