Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks

Conflicts:
	module/zfs/dsl_dataset.c

diff --cc module/zfs/dsl_dataset.c
index 558f969f960816a0223e31fce00860f09d64ad1d,ddd83576c65e8fbc69cb6b6eba180bc89cc0f66f..38e4762a35d0fc12a154caf030c63dce8fec375e
--- 1/module/zfs/dsl_dataset.c
--- 2/module/zfs/dsl_dataset.c
+++ b/module/zfs/dsl_dataset.c
@@@ -363,13 -391,13 +391,13 @@@ dsl_dataset_get_ref(dsl_pool_t *dp, uin
                mutex_init(&ds->ds_lock, NULL, MUTEX_DEFAULT, NULL);
                mutex_init(&ds->ds_recvlock, NULL, MUTEX_DEFAULT, NULL);
                mutex_init(&ds->ds_opening_lock, NULL, MUTEX_DEFAULT, NULL);
-               mutex_init(&ds->ds_deadlist.bpl_lock, NULL, MUTEX_DEFAULT,
-                   NULL);
 -              rw_init(&ds->ds_rwlock, 0, 0, 0);
 +              rw_init(&ds->ds_rwlock, NULL, RW_DEFAULT, NULL);
                cv_init(&ds->ds_exclusive_cv, NULL, CV_DEFAULT, NULL);
  
-               err = bplist_open(&ds->ds_deadlist,
+               bplist_create(&ds->ds_pending_deadlist);
+               dsl_deadlist_open(&ds->ds_deadlist,
                    mos, ds->ds_phys->ds_deadlist_obj);
+ 
                if (err == 0) {
                        err = dsl_dir_open_obj(dp,
                            ds->ds_phys->ds_dir_obj, NULL, ds, &ds->ds_dir);

diff --cc module/zfs/zap.c
Simple merge

diff --cc module/zfs/zap_micro.c
Simple merge