system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 10:48:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix build with gcc12.

Browse source
This commit is contained in:
Navdeep Parhar 2023-10-27 16:39:12 -07:00
parent aa7c028adb
commit c656f5c1a6
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/fs/ext2fs/ext2_inode.c
View file

@ -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;

6
sys/ufs/ffs/ffs_inode.c
View file

@ -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;