From nobody Sun Dec 11 00:38:18 2022 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 4NV5TQ58B7z4jgxm; Sun, 11 Dec 2022 00:38:18 +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 4NV5TQ3vYFz4HGF; Sun, 11 Dec 2022 00:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719098; 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=pqHLERS6VWgf9faN78JPk0GtgOWCq0gbzrQgMvCVZeI=; b=tXg+Ub8VPgLwvpKzSYR+afs3nWQkGezjPVjFNxDbmz//A2Af3pKpTuG2iyXazvU8VavAQM P5FrnoeUpNtLXUU3h4Mtm3tI27RuBuxeW/hs3YoODFhn4+Jiv4MEJy3U+jTW1m34jg8Dwd Memnn+sqi+OzK5Uesp6tWCgt7DKkmpQdgTh7YxzF9sKR6lAOth6vNW/7STLUuAtwasRxr7 5B9NL24RrzArNncCjzQoZsDq2rglWzmzDo/e0a1FKfZHlepDUdy58UeAmNQDuaOIDM/3R8 4Ua6cLRHQCUIX9L59g33JTdnBrN/B0o4YBSx6VHDuDr/hTWmz4GF73fz4U9b7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719098; 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=pqHLERS6VWgf9faN78JPk0GtgOWCq0gbzrQgMvCVZeI=; b=AuAckyhEsHdZiCARXixjSHAFicvrD5BnXPtgInV37BYm1VPR76TG8A+OSaH6fc4jRn40QR NIOF3+DKKVEsSCOKbOCC2QMfnTwUIdx2l0fosN+OFjp4MuIGz2UKpJiZZ5OZmKPecPXT8x aLz7+B4JPxt7CFWdOO9n9FfE9EFVBOiFiFqBn9/2Hplt0VIf6rG06uKsrHOECxeuhvws8D 28xaBPHUuxzMjlfMd23TEpPZ1burZuQqGbwu5PG1neNlDJsFSqhYmOBEMaMEaXNMtH48yK sAG8ZmJPZMCR2fskSsvhDparVE4V1CoPAP+1chCUk7oggTTdZy8/vuvDTEom4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670719098; a=rsa-sha256; cv=none; b=Q0Nkpr/2wBvudpLIeWj3aE7V7ym97qFkQAUF2KV8rmcKCPJag5t6PpCLdG9w5bl+pwfJKG 8oWwTUVkS0hp8sD4fw1OCCD14TDev13Yqqkeh25jpelJXEbRnZCJM+FUu9GmQ/+3IWopF8 gM9SH1dbQ6/ZLMAcjd0J83kXEpIPIBKbSNZ2v5xLY1xehnFkw372kAYOA8GXrr7V9ErTvx i6TH3Ef435UkB9OOLE+eZ2i48KxQoxBHvz9PuKdlqJoy7lJgdwJ2zJpzYJGsBoPvo5aes0 e01eHyKy+BW355YiZNfq82dPGNjcazCSOGV9RN6MuPmN8y1Wn4Ra0sZspbBcMw== 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 4NV5TQ2mxGzbdL; Sun, 11 Dec 2022 00:38:18 +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 2BB0cI6N003923; Sun, 11 Dec 2022 00:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BB0cIrA003922; Sun, 11 Dec 2022 00:38:18 GMT (envelope-from git) Date: Sun, 11 Dec 2022 00:38:18 GMT Message-Id: <202212110038.2BB0cIrA003922@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: 143e60a9e963 - stable/13 - Correct calculation of inode location in getnextino cache. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 143e60a9e963a83a4d0e6ba1fcb6d7e9e27dbe94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=143e60a9e963a83a4d0e6ba1fcb6d7e9e27dbe94 commit 143e60a9e963a83a4d0e6ba1fcb6d7e9e27dbe94 Author: Kirk McKusick AuthorDate: 2022-08-29 06:44:35 +0000 Commit: Kirk McKusick CommitDate: 2022-12-11 00:37:17 +0000 Correct calculation of inode location in getnextino cache. (cherry picked from commit 827622937efa741d5d84d72968cf1580a8c597d8) Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 1d65ec667d44..f0699aabe349 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -460,11 +460,11 @@ ginode(ino_t inumber, struct inode *ip) } if (sblock.fs_magic == FS_UFS1_MAGIC) { ip->i_dp = (union dinode *) - &ip->i_bp->b_un.b_dinode1[inumber - firstinum]; + &ip->i_bp->b_un.b_dinode1[inumber - ip->i_bp->b_index]; return; } ip->i_dp = (union dinode *) - &ip->i_bp->b_un.b_dinode2[inumber - firstinum]; + &ip->i_bp->b_un.b_dinode2[inumber - ip->i_bp->b_index]; if (ffs_verify_dinode_ckhash(&sblock, (struct ufs2_dinode *)ip->i_dp)) { pwarn("INODE CHECK-HASH FAILED"); prtinode(ip);