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

Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-09 11:31:42 -08:00
parent 3e51a61b0e f612969bdf
commit 6b4205fe71
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
module/zfs/zfs_ioctl.c
View File

@ -3156,15 +3156,27 @@ static struct dev_ops zfs_dev_ops = {
}; };
static struct modldrv zfs_modldrv = { static struct modldrv zfs_modldrv = {
#ifdef HAVE_SPL
NULL,
#else
&mod_driverops, &mod_driverops,
#endif /* HAVE_SPL */
"ZFS storage pool", "ZFS storage pool",
&zfs_dev_ops &zfs_dev_ops
}; };
static struct modlinkage modlinkage = { static struct modlinkage modlinkage = {
MODREV_1, MODREV_1,
#ifdef HAVE_ZPL
(void *)&zfs_modlfs, (void *)&zfs_modlfs,
#else
NULL,
#endif /* HAVE_ZPL */
(void *)&zfs_modldrv, (void *)&zfs_modldrv,
#ifdef HAVE_SPL
ZFS_MAJOR,
ZFS_MINORS,
#endif /* HAVE_SPL */
NULL NULL
}; };
@ -3232,8 +3244,17 @@ _fini(void)
return (error); return (error);
} }
#ifdef HAVE_SPL
module_init(_init);
module_exit(_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("ZFS");
MODULE_LICENSE("CDDL");
#else
int int
_info(struct modinfo *modinfop) _info(struct modinfo *modinfop)
{ {
return (mod_info(&modlinkage, modinfop)); return (mod_info(&modlinkage, modinfop));
} }
#endif /* HAVE_SPL */