From nobody Mon Aug 29 06:47:25 2022 X-Original-To: dev-commits-src-main@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 4MGLbK3CBPz4bRH9; Mon, 29 Aug 2022 06:47:25 +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 4MGLbK2fktz3b26; Mon, 29 Aug 2022 06:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661755645; 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=uHS4pyIkAMevOjotKGR/sRxr9bSusoWITDFfyoMpP0A=; b=q3dHkIXYeTKuLzsUHZw5N0WHMPbZNcl/KFO9lPFpWeueufOt5AZ6MnvwcMVwneYwPAneiy uYqRReBMinf9hDslfEUHQ7BkQj6bGPWTAVhan50+yWIA/c5MR1wO/1RIJ5eGCyzRD65b8w X6mQ7PGlRchIP0nsDPx9y0q384ME7PoF7LMSy26JqEXZezpWhnr+d03bGz3+hFEdLbnZrI DpN/+dGttj0adVUfHckzFr96J6aOiZTTr8w04b3BqBoe33n/7lFbbvwKj4SPrM0V9d38kj kLSaN5d1pVnU7Ads//FyeVk3fl0MhoMXj5wc2rAFPHtL0Ny+ikM255Av5zrOaw== 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 4MGLbK1j8ZzLgr; Mon, 29 Aug 2022 06:47:25 +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 27T6lPNT042269; Mon, 29 Aug 2022 06:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27T6lP5K042268; Mon, 29 Aug 2022 06:47:25 GMT (envelope-from git) Date: Mon, 29 Aug 2022 06:47:25 GMT Message-Id: <202208290647.27T6lP5K042268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 827622937efa - main - Correct calculation of inode location in getnextino cache. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 827622937efa741d5d84d72968cf1580a8c597d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661755645; 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=uHS4pyIkAMevOjotKGR/sRxr9bSusoWITDFfyoMpP0A=; b=NOuNqxtho5DbOJvpvaGM6Ci8353zxKQ2Pnehz/BNUrEealok0b50bbQwlt83y/WjE1Wf7H HtwrRRD8xkyaLxCB1fj8E40e16d0Y1Fsa9vkFR8LJP1j54f49mZ9A+tvoTlQv8uRQZH/Ah Mrszni4xJQICfw4bU2J6KH6TcPEA1CyJpEzelbN4kB7TV4j3ZkfiUSwohaEbHu/nIYZtB8 uc+m463gPx8+RZixU0DzcBLzH7YWm0QmSitXLsZ5xQHAm9p0kZIZW2KLFaiUbko6K21WFU sdz4FJjeF1DFzPed5vYEm56aglY2FtABeIn+WTgr7Gs1h/zKX3g5J2ZQwSeJOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661755645; a=rsa-sha256; cv=none; b=pvXxKw6Ym1VmpTVUGMFLHbr4O5LKpc3KcCZxvf6PKTqUyiVmOu/CDdWTAeUHHU0h5cLaKV nfuXIBDUNwYLP0P7w9GLlNGwuXugmiApgMCPayGB6Yn9DLvDWlXUgK8SYUdd+zKrvqJUro vA2lsJ4Ep7mMZYRm63Tq+snQWM1RQ2IHlLCMbgtZf4yzhMWvdJCQiVUBLyXnXw3c8vDDOs Rcs5IMzNB9/OYAe3+tytFBm49iFnTpmhNWfVJmLrzxOYqjBOfksUBhZ/uWTSfLIFZkhGSV bzzqJn8DRyN//M8sD1jgemNksacFtb1QndwhS0/rdunN8jF6TrEhiWW6EHEN0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=827622937efa741d5d84d72968cf1580a8c597d8 commit 827622937efa741d5d84d72968cf1580a8c597d8 Author: Kirk McKusick AuthorDate: 2022-08-29 06:44:35 +0000 Commit: Kirk McKusick CommitDate: 2022-08-29 06:47:17 +0000 Correct calculation of inode location in getnextino cache. Fix for 345bfec. Reported by: Peter Holm 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);