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 2010-07-20 16:16:52 -07:00
parent 41c051725d d069265759
commit a89b017c7a
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
module/zfs/zfs_ioctl.c
View File

@ -4648,6 +4648,12 @@ uint_t zfs_fsyncer_key;
extern uint_t rrw_tsd_key; extern uint_t rrw_tsd_key;
#endif #endif
#ifdef DEBUG
#define ZFS_DEBUG_STR " (DEBUG mode)"
#else
#define ZFS_DEBUG_STR ""
#endif
int int
_init(void) _init(void)
{ {
@ -4656,18 +4662,11 @@ _init(void)
spa_init(FREAD | FWRITE); spa_init(FREAD | FWRITE);
zfs_init(); zfs_init();
if ((error = zvol_init()) != 0) { if ((error = zvol_init()) != 0)
zfs_fini(); goto out1;
spa_fini();
return (error);
}
if ((error = zfs_attach()) != 0) { if ((error = zfs_attach()) != 0)
(void)zvol_fini(); goto out2;
zfs_fini();
spa_fini();
return (error);
}
#ifdef HAVE_ZPL #ifdef HAVE_ZPL
tsd_create(&zfs_fsyncer_key, NULL); tsd_create(&zfs_fsyncer_key, NULL);
@ -4676,9 +4675,20 @@ _init(void)
mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL);
#endif /* HAVE_ZPL */ #endif /* HAVE_ZPL */
printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n", ZFS_META_VERSION); printk(KERN_NOTICE "ZFS: Loaded ZFS Filesystem v%s%s\n",
ZFS_META_VERSION, ZFS_DEBUG_STR);
return (0); return (0);
out2:
(void) zvol_fini();
out1:
zfs_fini();
spa_fini();
printk(KERN_NOTICE "ZFS: Failed to Load ZFS Filesystem v%s%s"
", rc = %d\n", ZFS_META_VERSION, ZFS_DEBUG_STR, error);
return (error);
} }
int int
@ -4700,6 +4710,9 @@ _fini(void)
tsd_destroy(&zfs_fsyncer_key); tsd_destroy(&zfs_fsyncer_key);
#endif /* HAVE_ZPL */ #endif /* HAVE_ZPL */
printk(KERN_NOTICE "ZFS: Unloaded ZFS Filesystem v%s%s\n",
ZFS_META_VERSION, ZFS_DEBUG_STR);
return (0); return (0);
} }