Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

Conflicts:

	module/zfs/zfs_vfsops.c
This commit is contained in:
Brian Behlendorf 2009-07-06 15:17:38 -07:00
parent 41f6ebaea7 a6b1465e30
commit 07a56371aa
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/zfs/zfs_vfsops.c
View File

@ -1975,6 +1975,7 @@ zfs_init(void)
* Initialize znode cache, vnode ops, etc... * Initialize znode cache, vnode ops, etc...
*/ */
zfs_znode_init(); zfs_znode_init();
dmu_objset_register_type(DMU_OST_ZFS, zfs_space_delta_cb); dmu_objset_register_type(DMU_OST_ZFS, zfs_space_delta_cb);
#endif /* HAVE_ZPL */ #endif /* HAVE_ZPL */
} }