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

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

This commit is contained in:
Brian Behlendorf 2009-03-18 13:03:43 -07:00
parent b4df03d1e0 bcbe5c856f
commit a1c694bf03
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zdb/zdb.c
View File

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

17
lib/libzfs/libzfs_util.c
View File

@ -560,16 +560,10 @@ libzfs_init(void)
}
if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
/* XXX: Allow this failure on linux systems for now. It
* occurs when we attempt to open the /dev/zfs without the
* ZFS module stack loaded. This is normally a problem but
* tools such as zdb call this function and never use the
* ioctl() interface. Long term this should be cleaned up.
*/
if (errno != ENXIO) {
free(hdl);
return (NULL);
}
(void) fprintf(stderr, "Unable to open %s: (%d) %s\n",
ZFS_DEV, errno, strerror(errno));
free(hdl);
return (NULL);
}
#ifdef HAVE_SETMNTENT
@ -593,8 +587,7 @@ libzfs_init(void)
void
libzfs_fini(libzfs_handle_t *hdl)
{
if (hdl->libzfs_fd != -1)
(void) close(hdl->libzfs_fd);
(void) close(hdl->libzfs_fd);
if (hdl->libzfs_mnttab)
#ifdef HAVE_SETMNTENT
(void) endmntent(hdl->libzfs_mnttab);