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-11 11:15:09 -07:00
parent 866e6f46c7 54e72b511a
commit 1ccae0fd59
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/zfs/zap_micro.c
View File

@ -532,7 +532,7 @@ mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
ASSERT(RW_WRITE_HELD(&zap->zap_rwlock)); ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
sz = zap->zap_dbuf->db_size; sz = zap->zap_dbuf->db_size;
mzp = kmem_alloc(sz, KM_SLEEP); mzp = vmem_alloc(sz, KM_SLEEP);
bcopy(zap->zap_dbuf->db_data, mzp, sz); bcopy(zap->zap_dbuf->db_data, mzp, sz);
nchunks = zap->zap_m.zap_num_chunks; nchunks = zap->zap_m.zap_num_chunks;
@ -540,7 +540,7 @@ mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
err = dmu_object_set_blocksize(zap->zap_objset, zap->zap_object, err = dmu_object_set_blocksize(zap->zap_objset, zap->zap_object,
1ULL << fzap_default_block_shift, 0, tx); 1ULL << fzap_default_block_shift, 0, tx);
if (err) { if (err) {
kmem_free(mzp, sz); vmem_free(mzp, sz);
return (err); return (err);
} }
} }
@ -566,7 +566,7 @@ mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
if (err) if (err)
break; break;
} }
kmem_free(mzp, sz); vmem_free(mzp, sz);
*zapp = zap; *zapp = zap;
return (err); return (err);
} }