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

Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy

This commit is contained in:
Brian Behlendorf 2009-01-09 16:54:04 -08:00
parent d6e2f4a455 3977cefecc
commit ca328c5d30
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libzfs/libzfs_util.c
View File

@ -560,6 +560,12 @@ libzfs_init(void)
return (NULL);
}
#if defined(HAVE_SPL) && !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) {
free(hdl);
return (NULL);

4
module/zfs/zfs_ioctl.c
View File

@ -3188,7 +3188,7 @@ init(void)
rc = _init();
if (!rc)
printk(KERN_INFO "ZFS: Loaded v%s\n", VERSION);
printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n", VERSION);
return rc;
}
@ -3197,7 +3197,7 @@ void
fini(void)
{
(void)_fini();
printk(KERN_INFO "ZFS: Unloaded v%s\n", VERSION);
printk(KERN_INFO "ZFS: Unloaded ZFS Filesystem v%s\n", VERSION);
}
module_init(init);