Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-05-21 10:44:29 -07:00
parent 0e0bf0495b 3b79eba6d7
commit 11e4cd8f39
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zdb/zdb.c
View File

@ -2395,7 +2395,7 @@ main(int argc, char **argv)
kernel_init(FREAD); kernel_init(FREAD);
g_zfs = libzfs_init(); g_zfs = libzfs_init();
VERIFY(g_zfs != NULL); ASSERT(g_zfs != NULL);
for (c = 0; c < 256; c++) { for (c = 0; c < 256; c++) {
if (dump_all && c != 'l' && c != 'R') if (dump_all && c != 'l' && c != 'R')

1
lib/libzfs/libzfs_sendrecv.c
View File

@ -39,7 +39,6 @@
#include <sys/mntent.h> #include <sys/mntent.h>
#include <sys/mnttab.h> #include <sys/mnttab.h>
#include <sys/avl.h> #include <sys/avl.h>
#include <sys/debug.h>
#include <stddef.h> #include <stddef.h>
#include <libzfs.h> #include <libzfs.h>

2
lib/libzfs/libzfs_util.c
View File

@ -579,8 +579,6 @@ libzfs_init(void)
} }
if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) { 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); free(hdl);
return (NULL); return (NULL);
} }