From nobody Sun Dec 11 00:38:09 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 4NV5TF5F15z4jgVt; Sun, 11 Dec 2022 00:38:09 +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 4NV5TF4mzyz4GwY; Sun, 11 Dec 2022 00:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719089; 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=B5e/Rb081gZ1zOdIjphgQ2DFaFFA+Z7TQkY2yM214/w=; b=NLmwoHlPBdVTQsVqEH6Jh3GHGNfONxZlQLNvkoxD3vA0vhjFGNfQZpgJ6e5bstzUURTh5W bWWfrilselj8QKNCtNprGrfefRIE+TkkoI2Be2TZqG4/4OdjPjTnvdvCEomnRV1ZjDnjsh izXEbuwbMZHhYyisG1asEWEiWmzl2uxqRECiThUwseVjYUq/enNxN55HUjDsPWvXbQd9Ag hBp1wRoAkhem9UG/ReLmUutJj+5bIKZmA4ZRhCeMNIL6AcuE0syvWiIcGXx8bBfn8DOYVm jWuf9yh4mkM+ySo5ECsabFaUFR7gZ0WCPg9WtBVjDC7kDS81PgF4TLmCnpGAbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719089; 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=B5e/Rb081gZ1zOdIjphgQ2DFaFFA+Z7TQkY2yM214/w=; b=RTPsP4nQV9frk6+otpOT8ZoVhxN2EEnNqDj4H3lv1ZL8ywM6V3LWS2NL9YnNOJZnlg9fob uldQ99xqkZJKcBhpzISE+gQaK6f9EO+oaqFam1P+f9vF3hbrfSKBPpCJSRhiY7w2qSXPJa HYvTq3tEV3DOH/c+c1O0lk8fvdlAicugvANux6RY+8lvH8IdaOWvnDPjn03nTtuENIwf3o p1GYu0hfRreyJozWcxLQ/3LGMZUUipOiu58wDXxb8bZ6pDZXlmdxmvMnc24SEqepZjgLvk HkhfByrwbJqSU+szXzEfBGbdMLpBn6MjeiHFdGIL00/K6PI5aLN5e/Z9uePexg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670719089; a=rsa-sha256; cv=none; b=wejuX2u8BMrOeKE0pXMZrVFf97IwUEOqx5whrRDescgU16wiNw0li1N4D1XxKmgzw8s9/l NokiAGQOWVnZ7kznblBjsywa7MZ/xocHhAY0mgv3lK7oH7jeIsAE03Q0k8RTZdJk9whN2J 78bsjpZJ+plhtQoOzvfFndUZD4kg9jy+lJiFV7a4oOrHBjSbXHmotTxfuM7jNPwITsihll jEtxS8pvtJtyyVesRwLnhvMTu5xFt1B+Bfpgxt3X9kOj66nsQYlfwaMnQ5l6KCtTwJRf2r MnN6QAADwmYOtIlOaVJR/J+Wfo4k6nIrpo9qDko9LxiYIRpD7RfrFvWuYgLOVw== 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 4NV5TF3rZxzbk3; Sun, 11 Dec 2022 00:38:09 +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 2BB0c9bW003717; Sun, 11 Dec 2022 00:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BB0c9fI003716; Sun, 11 Dec 2022 00:38:09 GMT (envelope-from git) Date: Sun, 11 Dec 2022 00:38:09 GMT Message-Id: <202212110038.2BB0c9fI003716@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: bfae35b39be7 - stable/13 - Properly specify the level of indirect block being looked up. 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: bfae35b39be7c3be8a2983afdb746b9d94817075 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=bfae35b39be7c3be8a2983afdb746b9d94817075 commit bfae35b39be7c3be8a2983afdb746b9d94817075 Author: Kirk McKusick AuthorDate: 2022-05-05 23:57:03 +0000 Commit: Kirk McKusick CommitDate: 2022-12-11 00:37:16 +0000 Properly specify the level of indirect block being looked up. (cherry picked from commit 262b581d1791fa5905d8771bef7fc201ed46d790) Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index ccfe8782ac88..8a93ad092a4a 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -213,7 +213,7 @@ iblock(struct inodesc *idesc, off_t isize, int type) idesc->id_lbn++; n = (*func)(idesc); } else { - n = iblock(idesc, isize, type); + n = iblock(idesc, isize, type - 1); idesc->id_level++; } if (n & STOP) {