From 9f346abbe8645c58d8adb778c419bb5422c83cf4 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 25 Aug 2022 13:33:32 -0700 Subject: Revert "Avoid panic with recordsize > 128k, raw sending and no large_blocks" This reverts commit 80a650b7bb04bce3aef5e4cfd1d966e3599dafd4. This change inadvertently introduced a regression in ztest where one of the new ASSERTs is triggered in dsl_scan_visitbp(). Reviewed-by: George Amanakis Signed-off-by: Brian Behlendorf Issue #12275 Closes #13799 --- lib/libzfs/libzfs_sendrecv.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'lib/libzfs') diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c index 640051e3b..577ebf6aa 100644 --- a/lib/libzfs/libzfs_sendrecv.c +++ b/lib/libzfs/libzfs_sendrecv.c @@ -874,11 +874,6 @@ dump_ioctl(zfs_handle_t *zhp, const char *fromsnap, uint64_t fromsnap_obj, case EINVAL: zfs_error_aux(hdl, "%s", strerror(errno)); return (zfs_error(hdl, EZFS_BADBACKUP, errbuf)); - case ENOTSUP: - zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "large blocks detected but large_blocks feature " - "is inactive; raw send unsupported")); - return (zfs_error(hdl, EZFS_NOTSUP, errbuf)); default: return (zfs_standard_error(hdl, errno, errbuf)); @@ -2702,11 +2697,6 @@ zfs_send_one_cb_impl(zfs_handle_t *zhp, const char *from, int fd, case EROFS: zfs_error_aux(hdl, "%s", strerror(errno)); return (zfs_error(hdl, EZFS_BADBACKUP, errbuf)); - case ENOTSUP: - zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "large blocks detected but large_blocks feature " - "is inactive; raw send unsupported")); - return (zfs_error(hdl, EZFS_NOTSUP, errbuf)); default: return (zfs_standard_error(hdl, errno, errbuf)); -- cgit v1.2.3