Revert "Handle new dnode size in incremental..."

This reverts commit 65dcb0f67a4d72ee4e1e534703db5caacf1ec85f until
a comprehensive fix is finalized.  The stricter interior dnode
detection in 4c5b89f59e4e5c8f5b4680040118ebde09598bbe and the new
test case added by this patch revealed a issue with resizing
dnodes when receiving an incremental backup stream.

Signed-off-by: Brian Behlendorf <[email protected]>
Issue #6576

2 files changed, 0 insertions, 67 deletions

diff --git a/tests/zfs-tests/tests/functional/rsend/Makefile.am b/tests/zfs-tests/tests/functional/rsend/Makefile.am
index 7d5d1f027..199acb68b 100644
--- a/tests/zfs-tests/tests/functional/rsend/Makefile.am
+++ b/tests/zfs-tests/tests/functional/rsend/Makefile.am
@@ -23,7 +23,6 @@ dist_pkgdata_SCRIPTS = \
 	rsend_021_pos.ksh \
 	rsend_022_pos.ksh \
 	rsend_024_pos.ksh \
-	send_changed_dnodesize.ksh \
 	send_encrypted_heirarchy.ksh \
 	send-cD.ksh \
 	send-c_embedded_blocks.ksh \
diff --git a/tests/zfs-tests/tests/functional/rsend/send_changed_dnodesize.ksh b/tests/zfs-tests/tests/functional/rsend/send_changed_dnodesize.ksh
deleted file mode 100755
index e481b6f17..000000000
--- a/tests/zfs-tests/tests/functional/rsend/send_changed_dnodesize.ksh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/ksh
-
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright (c) 2017 by Lawrence Livermore National Security, LLC.
-#
-
-. $STF_SUITE/include/libtest.shlib
-. $STF_SUITE/tests/functional/rsend/rsend.kshlib
-
-#
-# Description:
-# Verify incremental receive properly handles objects with changed
-# dnode size.
-#
-# Strategy:
-# 1. Populate a dataset with dnodesize=auto with objects
-# 2. Take a snapshot
-# 3. Remove objects and set dnodesize=legacy
-# 4. Remount dataset so object numbers get recycled and formerly
-#    "interior" dnode slots get assigned to new objects
-# 5. Repopulate dataset
-# 6. Send first snapshot to new dataset
-# 7. Send incremental snapshot from second snapshot to new dataset
-#
-
-verify_runnable "both"
-
-log_assert "Verify incremental receive handles objects with changed dnode size"
-
-function cleanup
-{
-	rm -f $BACKDIR/fs-dn-auto
-	rm -f $BACKDIR/fs-dn-legacy
-}
-
-log_onexit cleanup
-
-log_must zfs create -o dnodesize=auto $POOL/fs
-mk_files 200 262144 0 $POOL/fs
-log_must zfs unmount $POOL/fs
-log_must zfs snapshot $POOL/fs@a
-log_must zfs mount $POOL/fs
-log_must rm /$POOL/fs/*
-log_must zfs unmount $POOL/fs
-log_must zfs set dnodesize=legacy $POOL/fs
-log_must zfs mount $POOL/fs
-mk_files 200 262144 0 $POOL/fs
-log_must zfs unmount $POOL/fs
-log_must zfs snapshot $POOL/fs@b
-log_must eval "zfs send $POOL/fs@a > $BACKDIR/fs-dn-auto"
-log_must eval "zfs send -i $POOL/fs@a $POOL/fs@b > $BACKDIR/fs-dn-legacy"
-log_must eval "zfs recv $POOL/newfs < $BACKDIR/fs-dn-auto"
-log_must eval "zfs recv $POOL/newfs < $BACKDIR/fs-dn-legacy"
-
-log_pass "Verify incremental receive handles objects with changed dnode size"