From nobody Wed Oct 15 07:25:25 2025 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 4cmjKd41Hxz6CsfJ; Wed, 15 Oct 2025 07:25:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cmjKd2ybhz3RCL; Wed, 15 Oct 2025 07:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760513125; 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=ptZzOEwKThRWzuByLPoCjvwI8wuWhkS6L/Brl0fJM78=; b=Htg1nqG/SKgzwZCGsrLgJ1nTI68uuHxkOvhjfHhx6mkbqubjPB71cjv2C8zE6We22iT/BL COpw9rC32LYWO4FC0QNjcsIQSksGGBMqBIZWSEenW+lXTFjuRkhuVoamwwFmuS2RAr+vKa azN4VYrwQTl1DVxyFALrNC2IxQL9xIY6ImHeESpC2fpjkpY0Jn3/wEy3HOremHGizevAT/ Fv695ACrgz9ke3AOfQMhRWO46+b+JvQyUgsQVS9pnoKqdOuEFuLSjnKwMw+rUyPB1kqYjh zOy6d5dSYkyPzGck1yA+h1rWgmMxohVbn9KK1CiBOvbhDPKQNbAzeCYZCQLU6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760513125; 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=ptZzOEwKThRWzuByLPoCjvwI8wuWhkS6L/Brl0fJM78=; b=omnfAiKBFNQCN+iJ6nsUrrnkKhI/d4ecTaTOrl50IgzHwubX5XVB5R6jrLLogrgePUBWoo YV2gSW1pHPvYDFqJKNUGcPcDeS3m35MBk83wSj3i8OP+U9+a9v8dMlW45jHc76Mjbob8sT QLqYgcF9yzluo2gpT1OqOGH3n/AoBNM5JcnQN9F07Jc/5PeLTdT5EJx3r7vwo1Fo4Q8hS6 IUxMlmM4NEKpoTrdg4hPUhdCaB/NmbUYirWpUd7RepyGVSz3HJBHgZsbqh8HTXB64s8YLr cwGTcWRlvd437s8KxhTvvHyP4ETBYqq3xE13eONZII+UhXS/Wy0v8vicOdvOJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760513125; a=rsa-sha256; cv=none; b=MSou8XdrVex6S+ZhHXzIr13KZebCmT/aj2Vw6JNnz3lUOCgtbWqiYC1elWYOZwrUpculLv 0DQIXsCTv/EGCHB8IQZsobAm9wNSXM5EJiNhyfx/B8ffDlvGwtt2UNnyudNYy93nuBgRfe jvgy3VirxR7TEq4cBlaU7oyHo8CAZhwDKvwfP8TzAAk5WaASXnr9nKirlyE08hhSfPxHVo rOwB21IXjqTIL4NpjtCPleMVtGw3IO55Ldz6z2uEqrdZxkbiaVfOs/WTpr10+KDGOAW+nz 55eu/c4pw/G07F0YkrMYIj9SiN0c8mtIrLFGszdTI+ZUO12k5+Bolx3kic8xTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cmjKd2TsdzD8W; Wed, 15 Oct 2025 07:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59F7PP36072397; Wed, 15 Oct 2025 07:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59F7PP0s072394; Wed, 15 Oct 2025 07:25:25 GMT (envelope-from git) Date: Wed, 15 Oct 2025 07:25:25 GMT Message-Id: <202510150725.59F7PP0s072394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: a0ea4c04b526 - main - ffs_truncate: correct INVARIANTS panic debug output 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0ea4c04b5269ac138a3cf551047076472c6028e Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=a0ea4c04b5269ac138a3cf551047076472c6028e commit a0ea4c04b5269ac138a3cf551047076472c6028e Author: Ryan Libby AuthorDate: 2025-10-15 04:03:04 +0000 Commit: Ryan Libby CommitDate: 2025-10-15 04:03:04 +0000 ffs_truncate: correct INVARIANTS panic debug output Reported by: GCC -Warray-bounds Reviewed by: mckusick Differential Revision: https://reviews.freebsd.org/D53037 --- sys/ufs/ffs/ffs_inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 970536a13aa5..f47cfd08f75a 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -653,8 +653,8 @@ done: for (i = 0; i < UFS_NDADDR; i++) if (newblks[i] != DIP(ip, i_db[i])) panic("ffs_truncate2: blkno %d newblks %jd != i_db %jd", - i, (intmax_t)newblks[UFS_NDADDR + level], - (intmax_t)DIP(ip, i_ib[level])); + i, (intmax_t)newblks[i], + (intmax_t)DIP(ip, i_db[i])); BO_LOCK(bo); if (length == 0 && (fs->fs_magic != FS_UFS2_MAGIC || ip->i_din2->di_extsize == 0) &&