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-11-20 10:58:52 -08:00
parent a40a4803a8 67154a81b9
commit 6376951ac9
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
module/zfs/zfs_ioctl.c
View File

@ -67,7 +67,6 @@
#include "zfs_namecheck.h" #include "zfs_namecheck.h"
#include "zfs_prop.h" #include "zfs_prop.h"
#include "zfs_deleg.h" #include "zfs_deleg.h"
#include "zfs_config.h"
extern struct modlfs zfs_modlfs; extern struct modlfs zfs_modlfs;
@ -3796,27 +3795,15 @@ 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
}; };
@ -3847,8 +3834,6 @@ _init(void)
ASSERT(error == 0); ASSERT(error == 0);
mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL);
printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n", ZFS_META_VERSION);
return (0); return (0);
} }
@ -3881,17 +3866,8 @@ _fini(void)
return (error); return (error);
} }
#ifdef HAVE_SPL
spl_module_init(_init);
spl_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 */