From e22bfeab4e35c3457abf0d17d8b44b64b331deb3 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 9 Jan 2009 16:50:08 -0800 Subject: [PATCH 1/2] Update load/unload message, mknod /dev/zfs when udev is unavailable --- lib/libzfs/libzfs_util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c index 22e3d0aa16..c377d51504 100644 --- a/lib/libzfs/libzfs_util.c +++ b/lib/libzfs/libzfs_util.c @@ -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); From 3977cefecced68d7d76177b92db6f2a9760cca52 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 9 Jan 2009 16:50:28 -0800 Subject: [PATCH 2/2] Update load/unload message, mknod /dev/zfs when udev is unavailable --- module/zfs/zfs_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index f4bfc90831..c582cc8eff 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -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);