Revert Fix zpl_writepage() deadlock

[zfs.git] / module / zfs / zap.c

diff --git a/module/zfs/zap.c b/module/zfs/zap.c
index 288a4d9..fa7e617 100644 (file)
--- a/module/zfs/zap.c
+++ b/module/zfs/zap.c
@@ -394,7 +394,7 @@ zap_create_leaf(zap_t *zap, dmu_tx_t *tx)
 
        ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
 
-       rw_init(&l->l_rwlock, 0, 0, 0);
+       rw_init(&l->l_rwlock, NULL, RW_DEFAULT, NULL);
        rw_enter(&l->l_rwlock, RW_WRITER);
        l->l_blkid = zap_allocate_blocks(zap, 1);
        l->l_dbuf = NULL;
@@ -453,7 +453,7 @@ zap_open_leaf(uint64_t blkid, dmu_buf_t *db)
        ASSERT(blkid != 0);
 
        l = kmem_alloc(sizeof (zap_leaf_t), KM_SLEEP);
-       rw_init(&l->l_rwlock, 0, 0, 0);
+       rw_init(&l->l_rwlock, NULL, RW_DEFAULT, NULL);
        rw_enter(&l->l_rwlock, RW_WRITER);
        l->l_blkid = blkid;
        l->l_bs = highbit(db->db_size)-1;
@@ -483,7 +483,7 @@ zap_open_leaf(uint64_t blkid, dmu_buf_t *db)
        ASSERT3U(ZAP_LEAF_HASH_NUMENTRIES(l), >, ZAP_LEAF_NUMCHUNKS(l) / 3);
 
        /* The chunks should begin at the end of the hash table */
-       ASSERT3P(&ZAP_LEAF_CHUNK(l, 0), ==,
+       ASSERT3P(&ZAP_LEAF_CHUNK(l, 0), ==, (zap_leaf_chunk_t *)
            &l->l_phys->l_hash[ZAP_LEAF_HASH_NUMENTRIES(l)]);
 
        /* The chunks should end at the end of the block */