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

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-08-03 16:04:51 -07:00
parent f15a49f947 5348255bbc
commit e5b0646d27
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/zfs/bpobj.c
View File

@ -140,6 +140,7 @@ bpobj_close(bpobj_t *bpo)
bpo->bpo_dbuf = NULL; bpo->bpo_dbuf = NULL;
bpo->bpo_phys = NULL; bpo->bpo_phys = NULL;
bpo->bpo_cached_dbuf = NULL; bpo->bpo_cached_dbuf = NULL;
bpo->bpo_object = 0;
mutex_destroy(&bpo->bpo_lock); mutex_destroy(&bpo->bpo_lock);
} }

2
module/zfs/zvol.c
View File

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