d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct calculation of inode location in getnextino cache.

Browse Source 
Fix for 345bfec.

Reported by:  Peter Holm
Sponsored by: The FreeBSD Foundation
This commit is contained in:
Kirk McKusick 2022-08-28 23:08:49 -07:00
parent b685df314f
commit 2e4da012d5
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/fsck_ffs/fsutil.c
View File

@ -465,7 +465,7 @@ flush(int fd, struct bufarea *bp)
struct ufs2_dinode *dp = bp->b_un.b_dinode2;
int i;
for (i = 0; i < INOPB(&sblock); dp++, i++) {
for (i = 0; i < bp->b_size; dp++, i += sizeof(*dp)) {
if (ffs_verify_dinode_ckhash(&sblock, dp) == 0)
continue;
pwarn("flush: INODE CHECK-HASH FAILED");

8
sbin/fsck_ffs/inode.c
View File

@ -425,7 +425,6 @@ void
ginode(ino_t inumber, struct inode *ip)
{
ufs2_daddr_t iblk;
ino_t numinodes;
if (inumber < UFS_ROOTINO || inumber > maxino)
errx(EEXIT, "bad inode number %ju to ginode",
@ -436,14 +435,12 @@ ginode(ino_t inumber, struct inode *ip)
ip->i_bp = &inobuf;
inobuf.b_refcnt++;
inobuf.b_index = firstinum;
numinodes = lastinum - firstinum;
} else if (icachebp != NULL &&
inumber >= icachebp->b_index &&
inumber < icachebp->b_index + INOPB(&sblock)) {
/* take an additional reference for the returned inode */
icachebp->b_refcnt++;
ip->i_bp = icachebp;
numinodes = INOPB(&sblock);
} else {
iblk = ino_to_fsba(&sblock, inumber);
/* release our cache-hold reference on old icachebp */
@ -460,15 +457,14 @@ ginode(ino_t inumber, struct inode *ip)
icachebp->b_refcnt++;
icachebp->b_index = rounddown(inumber, INOPB(&sblock));
ip->i_bp = icachebp;
numinodes = INOPB(&sblock);
}
if (sblock.fs_magic == FS_UFS1_MAGIC) {
ip->i_dp = (union dinode *)
&ip->i_bp->b_un.b_dinode1[inumber % numinodes];
&ip->i_bp->b_un.b_dinode1[inumber - firstinum];
return;
}
ip->i_dp = (union dinode *)
&ip->i_bp->b_un.b_dinode2[inumber % numinodes];
&ip->i_bp->b_un.b_dinode2[inumber - firstinum];
if (ffs_verify_dinode_ckhash(&sblock, (struct ufs2_dinode *)ip->i_dp)) {
pwarn("INODE CHECK-HASH FAILED");
prtinode(ip);