From nobody Tue Oct 31 17:43:56 2023 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 4SKcvJ5B5Hz4yg05; Tue, 31 Oct 2023 17:43:56 +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 4SKcvJ4Hm2z4GLR; Tue, 31 Oct 2023 17:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698774236; 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=SUz17JGcT+lKS1yiAMZhiW/nzzFe1OUBvoVhs3Th+CA=; b=bLP4Gci7qSJQzzy5bYX3Iq61Z5JaNrYZkp2ZdD8tiY//eV+Ra3XZ76SGtZFaLvXI+cAzr4 5gyxAgLFUgYcTsXoI1WD9uve4hCFdONdLBWIHvKglNkn3bG6/ubWiP3GsxZYU9ysb8FTwc uCEAB/ZoCbb8/J1JvQ2lRj8DzCqYn+UiHBIDmoMLeGBq4zolDJ1WW48wcZp2xgKrxum6yD MpldfoKXWXsifdnEkkfOtt2HNxDjeSdDb9BzwMCxbiZW6Za3LDX5Ou4JpUFHQSJL6bSigb YZgrpXmIdYA+IS9a7l0JA8M857wwVJsF+t+dgeHR6wfYYCR0/JldC731CXv0cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698774236; 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=SUz17JGcT+lKS1yiAMZhiW/nzzFe1OUBvoVhs3Th+CA=; b=SNDAE9cvt64iuSR2wgGpK6SHiTrigrUdvsFvlyN4C8mUzD41gl8WdMQsQoKLSxv2H5Zys5 dNlH3tnESlO+D2OkzIEp9s5ZFl+yDDlQQzDMXdxVOpo/vcC6rqcPcOICckotaUw71VlaLb 3XKR5wL55rAkDloStlYAiuDsCRYksJetHs4MY27c8fIZ95hgHammNWVmcfS9/x7vJNjjaX 1DudPFPxkZyS+A7vQUuaFR4Xm2itwdaAEV7CpnvvoGzhqOtsnuFbHGBZJ8GqPqtG9DZS/P BJO5mBIjyA4lGCR1oGAsmue+r3r+zimCW6SMvlYvrEWdrKiq5GiepiuNmASgHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698774236; a=rsa-sha256; cv=none; b=ikneEy5TA1iSrG/ebDloEgy76pRpKF/wyDtfBJduSD9YadncPLb5jq+p6q+KEC1Zzlh/0R Mr9BloUFeoX+ZUevd/ovH3U77g1Jjlv2Hrqrxazioex+O6/5heOFCi/U4srjpyD5EnOtTw yi8O5XytqUj+mHuDqFEQasKM/wLGOs8mbtcgnBvI08Nk/+n1dGzkkUe19K6LBtXYQKjNQO rs44GNVLtF2A3n5vAsSIIKk0BrwdpcRb0Ky1kOzohJ2Sbm7srXAetsiEVoQUWsAjk0fM3h ikcLItu+4ZtC9jYRiNcpB2w24RLbzNOShuhwdjaHGydQe3Mq1gi+bU0M0ZI5TA== 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 4SKcvJ3M63z1C6H; Tue, 31 Oct 2023 17:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VHhuVe014718; Tue, 31 Oct 2023 17:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VHhuxW014715; Tue, 31 Oct 2023 17:43:56 GMT (envelope-from git) Date: Tue, 31 Oct 2023 17:43:56 GMT Message-Id: <202310311743.39VHhuxW014715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 7523a37f68ec - stable/14 - Fix build with gcc12. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7523a37f68ec31b9268d0efe93c5920add3ad8c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=7523a37f68ec31b9268d0efe93c5920add3ad8c0 commit 7523a37f68ec31b9268d0efe93c5920add3ad8c0 Author: Navdeep Parhar AuthorDate: 2023-10-27 23:39:12 +0000 Commit: Navdeep Parhar CommitDate: 2023-10-31 15:59:28 +0000 Fix build with gcc12. (cherry picked from commit c656f5c1a6f8482f24a5a716267311c3e62b3114) --- sys/fs/ext2fs/ext2_inode.c | 6 ++++++ sys/ufs/ffs/ffs_inode.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/sys/fs/ext2fs/ext2_inode.c b/sys/fs/ext2fs/ext2_inode.c index 3ab566ee53fc..2c1cf9736fb5 100644 --- a/sys/fs/ext2fs/ext2_inode.c +++ b/sys/fs/ext2fs/ext2_inode.c @@ -232,7 +232,9 @@ ext2_ind_truncate(struct vnode *vp, off_t length, int flags, struct ucred *cred, struct inode *oip; e4fs_daddr_t bn, lbn, lastiblock[EXT2_NIADDR], indir_lbn[EXT2_NIADDR]; uint32_t oldblks[EXT2_NDADDR + EXT2_NIADDR]; +#ifdef INVARIANTS uint32_t newblks[EXT2_NDADDR + EXT2_NIADDR]; +#endif struct m_ext2fs *fs; struct buf *bp; int offset, size, level; @@ -348,11 +350,15 @@ ext2_ind_truncate(struct vnode *vp, off_t length, int flags, struct ucred *cred, * when we are done. */ for (i = 0; i < EXT2_NDADDR; i++) { +#ifdef INVARIANTS newblks[i] = oip->i_db[i]; +#endif oip->i_db[i] = oldblks[i]; } for (i = 0; i < EXT2_NIADDR; i++) { +#ifdef INVARIANTS newblks[EXT2_NDADDR + i] = oip->i_ib[i]; +#endif oip->i_ib[i] = oldblks[EXT2_NDADDR + i]; } oip->i_size = osize; diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index fb6e8dfb2f76..8ecd37e694e8 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -238,7 +238,9 @@ ffs_truncate(struct vnode *vp, struct inode *ip; ufs2_daddr_t bn, lbn, lastblock, lastiblock[UFS_NIADDR]; ufs2_daddr_t indir_lbn[UFS_NIADDR], oldblks[UFS_NDADDR + UFS_NIADDR]; +#ifdef INVARIANTS ufs2_daddr_t newblks[UFS_NDADDR + UFS_NIADDR]; +#endif ufs2_daddr_t count, blocksreleased = 0, blkno; struct bufobj *bo __diagused; struct fs *fs; @@ -546,11 +548,15 @@ ffs_truncate(struct vnode *vp, * when we are done. */ for (i = 0; i < UFS_NDADDR; i++) { +#ifdef INVARIANTS newblks[i] = DIP(ip, i_db[i]); +#endif DIP_SET(ip, i_db[i], oldblks[i]); } for (i = 0; i < UFS_NIADDR; i++) { +#ifdef INVARIANTS newblks[UFS_NDADDR + i] = DIP(ip, i_ib[i]); +#endif DIP_SET(ip, i_ib[i], oldblks[UFS_NDADDR + i]); } ip->i_size = osize;