Thu Dec 6 09:58:52 2018 UTC ()

Add missing ZFS_OBJ_HOLD_ENTER() / ZFS_OBJ_HOLD_EXIT() to zfs_zget_cleaner().


(hannken)

diff -r1.22 -r1.23 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c

--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c 2018/11/28 09:55:36	1.22
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c 2018/12/06 09:58:52	1.23

 @@ -1178,43 +1178,49 @@ zfs_zget(zfsvfs_t *zfsvfs, uint64_t obj_
 	return zfs_do_zget(zfsvfs, obj_num, zpp, vcache_get);
+}
 int
 zfs_zget_cleaner(zfsvfs_t *zfsvfs, uint64_t obj_num, znode_t **zpp)
+{
 	dmu_buf_t *db;
 	sa_handle_t *hdl;
 	dmu_object_info_t doi;
 	znode_t *zp;
 	int err;
 	ZFS_OBJ_HOLD_ENTER(zfsvfs, obj_num);
 	err = sa_buf_hold(zfsvfs->z_os, obj_num, NULL, &db);
 	if (err) {
 		ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
 		return (SET_ERROR(err));
+	}
 	dmu_object_info_from_db(db, &doi);
 	if (doi.doi_bonus_type != DMU_OT_SA &&
 	    (doi.doi_bonus_type != DMU_OT_ZNODE ||
 	    (doi.doi_bonus_type == DMU_OT_ZNODE &&
 	    doi.doi_bonus_size < sizeof (znode_phys_t)))) {
 		sa_buf_rele(db, NULL);
 		ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
 		return (SET_ERROR(EINVAL));
+	}
 	hdl = dmu_buf_get_user(db);
-	KASSERT(hdl != NULL);
+	ASSERT3P(hdl, !=, NULL);
 	zp = sa_get_userdata(hdl);
 	ASSERT3U(zp->z_id, ==, obj_num);
 	sa_buf_rele(db, NULL);
 	ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
 	*zpp = zp;
 	return (0);
+}
 /*
  * Callback from vcache to set up the znode.
  * This is largely copied from zfs_znode_alloc().
  */
 int
 zfs_loadvnode(struct mount *mp, struct vnode *vp,
     const void *key, size_t key_len, const void **new_key)
+{