d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce diff against vendor - we have now stronger check for "mutex already

Browse Source 
initialized", so we can go back to kmem_alloc().
This commit is contained in:
Pawel Jakub Dawidek 2007-04-10 02:19:12 +00:00
parent 75efd6fd67
commit 52124c7f1c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
View File

@ -382,7 +382,7 @@ static zap_leaf_t *
zap_create_leaf(zap_t *zap, dmu_tx_t *tx)
{
void *winner;
zap_leaf_t *l = kmem_zalloc(sizeof (zap_leaf_t), KM_SLEEP);
zap_leaf_t *l = kmem_alloc(sizeof (zap_leaf_t), KM_SLEEP);
ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
@ -443,7 +443,7 @@ zap_open_leaf(uint64_t blkid, dmu_buf_t *db)
ASSERT(blkid != 0);
l = kmem_zalloc(sizeof (zap_leaf_t), KM_SLEEP);
l = kmem_alloc(sizeof (zap_leaf_t), KM_SLEEP);
rw_init(&l->l_rwlock, NULL, RW_DEFAULT, 0);
rw_enter(&l->l_rwlock, RW_WRITER);
l->l_blkid = blkid;

4
sys/contrib/opensolaris/uts/common/fs/zfs/zap.c
View File

@ -382,7 +382,7 @@ static zap_leaf_t *
zap_create_leaf(zap_t *zap, dmu_tx_t *tx)
{
void *winner;
zap_leaf_t *l = kmem_zalloc(sizeof (zap_leaf_t), KM_SLEEP);
zap_leaf_t *l = kmem_alloc(sizeof (zap_leaf_t), KM_SLEEP);
ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
@ -443,7 +443,7 @@ zap_open_leaf(uint64_t blkid, dmu_buf_t *db)
ASSERT(blkid != 0);
l = kmem_zalloc(sizeof (zap_leaf_t), KM_SLEEP);
l = kmem_alloc(sizeof (zap_leaf_t), KM_SLEEP);
rw_init(&l->l_rwlock, NULL, RW_DEFAULT, 0);
rw_enter(&l->l_rwlock, RW_WRITER);
l->l_blkid = blkid;