From nobody Wed Feb 23 16:42:57 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E2BEB19DAF62; Wed, 23 Feb 2022 16:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K3hfn4dkzz4n0W; Wed, 23 Feb 2022 16:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645634577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GImxibXGJbharZwYe1qVjkgQgbchMM5FHQqGUKjj3+E=; b=Occ+B0heTpItHrQmKoXgpsFVwT9C8xNF1T7PSkxXIssEAFDQFJM7TubIDrRBXqqayhBQer 3y0qcKCrTozEXCSDcDudwMwHjIlh5TCqpyTH2NXotSUJKa5jA1Ez5ekaj8GhoYe8a/tt+G f2jCyLGBxYwEI/L9vqoTzGJWADxe7IrDglyhkNy5en6k2sezM8/DhsCJBn9LZj007Wa+wS GvBgsryBZs3BiVhYc85vPOluo1tBcUkZo+/ZBiYwiiIULF8tkYaGtKgZvbiHHCuRVeruNw y6kVa3+77ny9C4t2XudUpRJ06Yci32bJVuotIOAWEDfWXpYOoU1CVmPC0QkBpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 764C91BA7A; Wed, 23 Feb 2022 16:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21NGgvk8006801; Wed, 23 Feb 2022 16:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NGgv6I006800; Wed, 23 Feb 2022 16:42:57 GMT (envelope-from git) Date: Wed, 23 Feb 2022 16:42:57 GMT Message-Id: <202202231642.21NGgv6I006800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2997ab002e0c - main - fbt: Remove handling for CTFv1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2997ab002e0c3430aff00c8b6f6b0c44c6707bd7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645634577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GImxibXGJbharZwYe1qVjkgQgbchMM5FHQqGUKjj3+E=; b=ef6Tewse4j+E2qfarOTIaRtsiDi30VxgyCa3x4GE5+rjCo9Vjlo0AEFqT9rENnzak3Bmum g3NVNgO5fhlsl2sYfa2DhHU1cfWfCjG93V417SKXB5x0eLuHjCgjUtYPO1j8xcXRjvvWTC IwZJjnnz+WYsRn/mGAxc2fMzZCNnm/WVY4jLhRxm42nUqpCyOnbI3wyVVDRGbCfXwIxBe6 tJZxylHdbPBEisMW8F3Gt0u2PVYbRWmYqoYJ3PmLQAXdeTBCKUBQ+qrqssa8yRZF30CANi hUdj867ZV5NnHG2fjVNh5uT9wRM8vtZsbTXtHzqn84UkYqliBI5qOWeyKQNzzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645634577; a=rsa-sha256; cv=none; b=A2xNHXDHX2IoI3v4sERAdTkmnHWLtc7hpEYXKg8QfWE8YQHOPNl46dT1B9ioIKiXC7brXO XZSVCAG6hODnn6AL3g4OMT+KrJLCV32bLG+DqHMKDtSd0SE9kVWtysDR6Rdbd9gVXyn0bS GxHRlgpVdHW2JXWsTTMHiO/hDDSNxYaR9pBKJKn5GadkY77nSzAzNebxVTrOkYh8Uw2cWt KsjSmTxmmc2PEfeqB6uDAKEh3k7Q6rJdxHlskEpwAjkLnXmEllNwIB5L05Jq5QBLAao432 IFceeKOWkSSmw7vn+3Ngy4hhXz4LxAFsPmTb9BNXNnAm17paTJmbemnQM8gDTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2997ab002e0c3430aff00c8b6f6b0c44c6707bd7 commit 2997ab002e0c3430aff00c8b6f6b0c44c6707bd7 Author: Mark Johnston AuthorDate: 2022-02-23 14:58:35 +0000 Commit: Mark Johnston CommitDate: 2022-02-23 16:41:22 +0000 fbt: Remove handling for CTFv1 MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/cddl/dev/fbt/fbt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c index 2137075e3831..5b1aeab3bafb 100644 --- a/sys/cddl/dev/fbt/fbt.c +++ b/sys/cddl/dev/fbt/fbt.c @@ -446,8 +446,7 @@ fbt_get_ctt_size(uint8_t version, const ctf_type_t *tp, ssize_t *sizep, { ssize_t size, increment; - if (version > CTF_VERSION_1 && - tp->ctt_size == CTF_LSIZE_SENT) { + if (tp->ctt_size == CTF_LSIZE_SENT) { size = CTF_TYPE_LSIZE(tp); increment = sizeof (ctf_type_t); } else {