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-17 16:07:06 -07:00
parent a403c702cb 37ff131fd6
commit 3f3dc327fa
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libspl/include/sys/stropts.h Normal file
View File

@ -0,0 +1,4 @@
#ifndef _LIBSPL_SYS_STROPTS_H
#define _LIBSPL_SYS_STROPTS_H
#endif /* _LIBSPL_SYS_STROPTS_H */

7
module/zfs/zfs_ioctl.c
View File

@ -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;
@ -3299,7 +3300,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;
}
@ -3308,7 +3310,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);