From 085d04563daeb07f5c18a1c97024c041a947698d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 17 Mar 2009 15:53:34 -0700 Subject: [PATCH 1/2] Add stub header which is missing in new versions of glibc --- lib/libspl/include/sys/stropts.h | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 lib/libspl/include/sys/stropts.h diff --git a/lib/libspl/include/sys/stropts.h b/lib/libspl/include/sys/stropts.h new file mode 100644 index 0000000000..3c86957baf --- /dev/null +++ b/lib/libspl/include/sys/stropts.h @@ -0,0 +1,4 @@ +#ifndef _LIBSPL_SYS_STROPTS_H +#define _LIBSPL_SYS_STROPTS_H + +#endif /* _LIBSPL_SYS_STROPTS_H */ From a9b0088f48ddeded6c08c1eb30eac296d8a2194c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 17 Mar 2009 16:02:09 -0700 Subject: [PATCH 2/2] Use include missing zfs_config.h and use ZFS_META_VERSION (not VERSION) --- module/zfs/zfs_ioctl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 832e0652cd..50563b5bf8 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -67,6 +67,7 @@ #include "zfs_namecheck.h" #include "zfs_prop.h" #include "zfs_deleg.h" +#include "zfs_config.h" extern struct modlfs zfs_modlfs; @@ -3233,7 +3234,8 @@ init(void) rc = _init(); if (!rc) - printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n", VERSION); + printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n", + ZFS_META_VERSION); return rc; } @@ -3242,7 +3244,8 @@ void fini(void) { (void)_fini(); - printk(KERN_INFO "ZFS: Unloaded ZFS Filesystem v%s\n", VERSION); + printk(KERN_INFO "ZFS: Unloaded ZFS Filesystem v%s\n", + ZFS_META_VERSION); } module_init(init);