From nobody Tue Oct 28 09:49:47 2025 X-Original-To: dev-commits-src-branches@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 4cwlwD2FhSz6DbGF; Tue, 28 Oct 2025 09:49:48 +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 4cwlwD04Gwz3DG9; Tue, 28 Oct 2025 09:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761644988; 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=Z8zQZl0VWVIlKjLgDx9JawImlzr5Z5wL/IMIO4RALgw=; b=vyzF65YxkS2fxhCvdheI241Bjn5PsOD369Y9oNbvgokB2EymHwTr38wJf4ma+rryqXZH53 E68uc9KoRlz0y4JD92i30jBRTWuARyicnuP9U1Y6MYyAB78WXcnkEZQCU6XNCCTX3Y/r6L SXV/4LQGpXhBoY7Hp7u/MhCzUPC0JnnEAnM3oaFKTh6v+ZVAoFH7xjCAhIpH5AOQsnSNpK lyl73FosZRsqmQLuNd2cb1Hitg5i/KjfUikAYT8P5mxW8GO6d6nlJkPGCFxIOidkxd6Qlu rHd+Qh4cnJkWcV5r6gPj+QDvB6pZ9LU5MkzwlZM6cgmvbr5m/YgD9RzD8A+yxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761644988; 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=Z8zQZl0VWVIlKjLgDx9JawImlzr5Z5wL/IMIO4RALgw=; b=ZVGKUO3k2TZn3qdP9wozUbLX7IpUbynONtSTr51/Gn5a1oEFe8LXvEYosBD0mIhcjLTZeg Is3cNIMeRPGyC+ssKIXoFIa0P4p2M7wZ4JtaGS7YMRDDyfKVmUUezeGHCETRvtr0FfT2U+ 26ia/FgxLJPMMtD+dsET4kxLI8Wnf3e8KlF1t6Sl7+XMyJOGdvI2gDLtuC2nFNUuuo7RKZ t+g9A4agKH53Mx4rXil3zEFH0uhy0glGvZ9m9bK/n7xHTK8nDBBcmEeAHtHgZTJm/+Tw7X yXYZKuspjGE8Ahlo4lVTSbJmc2pXw3CdKaPTVGXNOKMKsaN0N2y8yQucmhdTYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761644988; a=rsa-sha256; cv=none; b=F62sGAj405QaaTXHYYn+tSukcc+I6dZBkgW6dIHS2NTuey0R1LWJ46TxiGuKGztLn/wE8n dM4yiGXAr+rThybqRdur/H5K+Uqcx4A9rV3dgIDAkXNREiCZj27HZMvP9kqDk1XaQR3roc nYkZUmfmLvt3+Q/IiL8mvMhTK/YZbepfHBXCpyw4L0lgdWs93WsV1jD8KBXTetO0C+gtYT lg6EhLEU8XQ+xrx1saEUpln40S1zltpS5kGL4mvR8qIEt8pwr0C0RS2/e0m+ybkLdV7zIn kqEBO5GUFprCnE+hQoz8uaUDV+HI68iGgZnajRgdgJuFfUig+2M8rSMKK2dnzA== 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 4cwlwC6GXTzlrJ; Tue, 28 Oct 2025 09:49:47 +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 59S9nldW057014; Tue, 28 Oct 2025 09:49:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S9nlxD057011; Tue, 28 Oct 2025 09:49:47 GMT (envelope-from git) Date: Tue, 28 Oct 2025 09:49:47 GMT Message-Id: <202510280949.59S9nlxD057011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ryan Libby Subject: git: cd6b58e50cda - stable/15 - ffs_truncate: correct INVARIANTS panic debug output List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: cd6b58e50cda3c945d9b3910a3103eb825fc36c0 Auto-Submitted: auto-generated The branch stable/15 has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=cd6b58e50cda3c945d9b3910a3103eb825fc36c0 commit cd6b58e50cda3c945d9b3910a3103eb825fc36c0 Author: Ryan Libby AuthorDate: 2025-10-15 04:03:04 +0000 Commit: Ryan Libby CommitDate: 2025-10-28 09:20:35 +0000 ffs_truncate: correct INVARIANTS panic debug output Reported by: GCC -Warray-bounds Reviewed by: mckusick Differential Revision: https://reviews.freebsd.org/D53037 (cherry picked from commit a0ea4c04b5269ac138a3cf551047076472c6028e) --- 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) &&