From nobody Sun Dec 11 00:38:17 2022 X-Original-To: dev-commits-src-all@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 4NV5TP3P0Qz4jgq4; Sun, 11 Dec 2022 00:38:17 +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 4NV5TP2rnYz4HWj; Sun, 11 Dec 2022 00:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719097; 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=7jtH3//hwOFcKNgTbcFs+1Xaw5ySpu/CdWZrIpf++SE=; b=OVczpc7RWqio/taP4U+COmrAlPrKzBqeacKjKBg9cVlfSxiZNZO6MhxlrHezDW/WFEp3LL K/6Z1gNgqzb5fc5F1zaSnDoY4uebQosv7+kn6ahoI1k4/P6vcqzg2vcra7M6Z2YQ1QODw8 eTDCux8SAJtjM5JimL/v7ZPvGqHsebBnV+gWIx/x0puBmKg4vujkKr4Uo9fgj3Gw+93pk/ VAIbu1SoxWHv5bvthWwbdvgVebHFLNGYe1rxrBAtaFIO8p6C50EWJMdysd/5kqeHqsWg/G MOTkvt3/MgpioAK1bPzXNrBGewHQyTR0lBYsQJhYjTYcvcaKvNyDR7RM+/cR4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719097; 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=7jtH3//hwOFcKNgTbcFs+1Xaw5ySpu/CdWZrIpf++SE=; b=kL5XsHOLb7O4LaRQIB0qIxSdRzVYv+ox8dM1Aiwl0M7eQQOiQ91qcIGVBAEaHfirDRQGlT ycQomfdTi7lNVevEF7/q39LQy9TWeKcf1lGYXV8DQ0WFe8BFXSNXToJOoXJQunnvOLb7qb YKnK7KeZp1mlPs7EqtTTkFIth0n1tyO8arS7MCVSGt245wUH1iM3c9dfsughQ7pAx1Uguq L6/XlzOAbBjxHgv2mzs/veu47/0WsQy46By41geFfStXaKuABgYUW9yY3jAjG6E630hZGo Y8iiQCs3nfLF6PTaeuAf1A4WUYYRn7XgoRYl/VQz4O0r8dPl/wTZTj5z/hCdGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670719097; a=rsa-sha256; cv=none; b=a1WzcoqHZnMoFYjmLhJtMn/swyUQGIj6UiXEM6tfJJMDF+Y7onuCc5emq7DKNBxTs6yScn wcE/39ZHo8OQ9ZCYFHSs/4+QlNTJ2B5PvXo6NIAswTBpP0Zz2N3D1MGkL8pRhgGQYZzdi+ xFEcH3+LOd9FpA8EPRfkUe71Ehy8EzxolfJlIysirVwxWNmGHSuHxnHxQ+PbvXi/aindmy mQWDu4pr/Lcmy8Opu1+uvvIpHzfVQI8Hm43frN3a9wADXRsDjK4Ufmay9UDIOou0li/75u ezcQLYIw5kC/m8kROjqX42zkp0Hf2H2FsBpQiuhenvwJsPn/KcxRvOQRBXTzfw== 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 4NV5TP1r1czbmj; Sun, 11 Dec 2022 00:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BB0cHar003899; Sun, 11 Dec 2022 00:38:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BB0cHrF003898; Sun, 11 Dec 2022 00:38:17 GMT (envelope-from git) Date: Sun, 11 Dec 2022 00:38:17 GMT Message-Id: <202212110038.2BB0cHrF003898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 9183ec42dd44 - stable/13 - Correct calculation of inode location in getnextino cache. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9183ec42dd447e366039b0088bdcb70b356010b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=9183ec42dd447e366039b0088bdcb70b356010b4 commit 9183ec42dd447e366039b0088bdcb70b356010b4 Author: Kirk McKusick AuthorDate: 2022-08-29 06:08:49 +0000 Commit: Kirk McKusick CommitDate: 2022-12-11 00:37:17 +0000 Correct calculation of inode location in getnextino cache. (cherry picked from commit 2e4da012d57edab9d71dc7a67dc706b6a9b7800d) Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/fsutil.c | 2 +- sbin/fsck_ffs/inode.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index f2d198fa294a..923a945fc104 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -464,7 +464,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"); diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index ae7124784415..1d65ec667d44 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -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);