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

Conflicts: module/zfs/zfs_vfsops.c
2009-07-06 15:17:38 -07:00 · 2009-07-06 15:17:38 -07:00 · 07a56371aa
parent 41f6ebaea7 a6b1465e30
commit 07a56371aa
1 changed files with 1 additions and 0 deletions
--- a/module/zfs/zfs_vfsops.c
+++ b/module/zfs/zfs_vfsops.c
@ -1975,6 +1975,7 @@ zfs_init(void)
 	 * Initialize znode cache, vnode ops, etc...
 	 */
 	zfs_znode_init();
+
 	dmu_objset_register_type(DMU_OST_ZFS, zfs_space_delta_cb);
 #endif /* HAVE_ZPL */
 }