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-01-09 13:01:24 -08:00
parent 307c1ea71d a0e6b003d4
commit 7973279404
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/zfs/zfs_ioctl.c
View File

@ -3196,12 +3196,12 @@ _init(void)
return (error); return (error);
} }
tsd_create(&zfs_fsyncer_key, NULL);
tsd_create(&rrw_tsd_key, NULL);
error = ldi_ident_from_mod(&modlinkage, &zfs_li); error = ldi_ident_from_mod(&modlinkage, &zfs_li);
ASSERT(error == 0); ASSERT(error == 0);
#ifdef HAVE_ZPL #ifdef HAVE_ZPL
tsd_create(&zfs_fsyncer_key, NULL);
tsd_create(&rrw_tsd_key, NULL);
mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL);
#endif /* HAVE_ZPL */ #endif /* HAVE_ZPL */
@ -3231,9 +3231,9 @@ _fini(void)
(void) ddi_modclose(sharefs_mod); (void) ddi_modclose(sharefs_mod);
mutex_destroy(&zfs_share_lock); mutex_destroy(&zfs_share_lock);
tsd_destroy(&zfs_fsyncer_key);
#endif /* HAVE_ZPL */ #endif /* HAVE_ZPL */
tsd_destroy(&zfs_fsyncer_key);
ldi_ident_release(zfs_li); ldi_ident_release(zfs_li);
zfs_li = NULL; zfs_li = NULL;