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

Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-08-03 16:02:43 -07:00
parent 34bc488111 a54f5dddf1
commit f216be8859
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/zvol.c
View File

@ -1118,6 +1118,7 @@ __zvol_create_minor(const char *name)
zv->zv_flags |= ZVOL_RDONLY;
zv->zv_volblocksize = doi->doi_data_block_size;
zv->zv_objset = os;
if (zil_replay_disable)
zil_destroy(dmu_objset_zil(os), B_FALSE);
@ -1130,6 +1131,7 @@ __zvol_create_minor(const char *name)
out_dmu_objset_disown:
dmu_objset_disown(os, zvol_tag);
zv->zv_objset = NULL;
out_doi:
kmem_free(doi, sizeof(dmu_object_info_t));
out: