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-10-01 17:08:00 -07:00
parent 9fd246a1d3 ea0bf0146f
commit cd01e2a6c9
5 changed files with 26 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
module/avl/avl.c
View File

@ -1033,18 +1033,11 @@ done:
}
#if defined(_KERNEL) && defined(HAVE_SPL)
static int __init avl_init(void)
{
return 0;
}
static int avl_init(void) { return 0; }
static int avl_fini(void) { return 0; }
static void avl_fini(void)
{
return;
}
module_init(avl_init);
module_exit(avl_fini);
spl_module_init(avl_init);
spl_module_exit(avl_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Generic AVL tree implementation");

15
module/nvpair/nvpair.c
View File

@ -3246,18 +3246,11 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen)
}
#if defined(_KERNEL) && defined(HAVE_SPL)
static int __init nvpair_init(void)
{
return 0;
}
static int nvpair_init(void) { return 0; }
static int nvpair_fini(void) { return 0; }
static void nvpair_fini(void)
{
return;
}
module_init(nvpair_init);
module_exit(nvpair_fini);
spl_module_init(nvpair_init);
spl_module_exit(nvpair_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Generic name/value pair implementation");

15
module/unicode/u8_textprep.c
View File

@ -2133,18 +2133,11 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
}
#if defined(_KERNEL) && defined(HAVE_SPL)
static int __init unicode_init(void)
{
return 0;
}
static int unicode_init(void) { return 0; }
static int unicode_fini(void) { return 0; }
static void unicode_fini(void)
{
return;
}
module_init(unicode_init);
module_exit(unicode_fini);
spl_module_init(unicode_init);
spl_module_exit(unicode_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Unicode implementation");

27
module/zcommon/zfs_prop.c
View File

@ -534,6 +534,16 @@ zfs_prop_align_right(zfs_prop_t prop)
#endif
#if defined(_KERNEL) && defined(HAVE_SPL)
static int zcommon_init(void) { return 0; }
static int zcommon_fini(void) { return 0; }
spl_module_init(zcommon_init);
spl_module_exit(zcommon_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Generic ZFS support");
MODULE_LICENSE("CDDL");
/* zfs dataset property functions */
EXPORT_SYMBOL(zfs_userquota_prop_prefixes);
EXPORT_SYMBOL(zfs_prop_init);
@ -555,21 +565,4 @@ EXPORT_SYMBOL(zfs_prop_index_to_string);
EXPORT_SYMBOL(zfs_prop_string_to_index);
EXPORT_SYMBOL(zfs_prop_valid_for_type);
static int __init zcommon_init(void)
{
return 0;
}
static void zcommon_fini(void)
{
return;
}
module_init(zcommon_init);
module_exit(zcommon_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Generic ZFS support");
MODULE_LICENSE("CDDL");
#endif

27
module/zfs/zfs_ioctl.c
View File

@ -3947,6 +3947,8 @@ _init(void)
mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL);
#endif /* HAVE_ZPL */
printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n", ZFS_META_VERSION);
return (0);
}
@ -3983,29 +3985,8 @@ _fini(void)
}
#ifdef HAVE_SPL
int
init(void)
{
int rc;
rc = _init();
if (!rc)
printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n",
ZFS_META_VERSION);
return rc;
}
void
fini(void)
{
(void)_fini();
printk(KERN_INFO "ZFS: Unloaded ZFS Filesystem v%s\n",
ZFS_META_VERSION);
}
module_init(init);
module_exit(fini);
spl_module_init(_init);
spl_module_exit(_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("ZFS");