Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
37305ec1e8
|
@ -560,12 +560,6 @@ libzfs_init(void)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(HAVE_GPL_ONLY_SYMBOLS)
|
|
||||||
/* If we don't have access to GPL-only symbols then we may not
|
|
||||||
* use the udev APIs, therefore we must mknod the device ourselves. */
|
|
||||||
(void)mknod(ZFS_DEV, S_IFCHR | 0600, makedev(ZFS_MAJOR, 0));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
|
if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
|
||||||
/* XXX: Allow this failure on linux systems for now. It
|
/* XXX: Allow this failure on linux systems for now. It
|
||||||
* occurs when we attempt to open the /dev/zfs without the
|
* occurs when we attempt to open the /dev/zfs without the
|
||||||
|
|
Loading…
Reference in New Issue