diff options
| author | pjd <pjd@FreeBSD.org> | 2007-04-10 02:19:12 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2007-04-10 02:19:12 +0000 |
| commit | 9cb5f5d713f6ab8b5b850ee732b46aa4b9c80d49 (patch) | |
| tree | 89a62d0e05469e2a1ccfcccaf68540d28e93d621 /sys/cddl | |
| parent | 2b0769a8086eb8a46b531a40197a6502744bbc1d (diff) | |
| download | FreeBSD-src-9cb5f5d713f6ab8b5b850ee732b46aa4b9c80d49.zip FreeBSD-src-9cb5f5d713f6ab8b5b850ee732b46aa4b9c80d49.tar.gz | |
Reduce diff against vendor - we have now stronger check for "mutex already
initialized", so we can go back to kmem_alloc().
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c index 533431f..fe1294b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c @@ -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; |
