From nobody Sat Apr 29 18:11:02 2023 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 4Q7yFy4D27z484Xf; Sat, 29 Apr 2023 18:11:02 +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 4Q7yFy3XjBz3HXJ; Sat, 29 Apr 2023 18:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682791862; 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=onifTwhC1zRluxUt573QI+HxHM2yUnJCSHLvbYjYlok=; b=RicWbCXukJQW1C3ROXor69M8jFc6V2S4qdJaWHY2lLqrUXrqfk53E+wLvs+8Gj6v6x3vvl 8igSNm5VRNtSdXkYCxv+CGIpEblKD1AU0GRLTTMMQBv8S+mNFoPSVRKYHXPSkEQJWk/TNg 1hdVX2M9j0PkV0FBu4ZhiS4JbI409gp/nR2i0qFQU0NMYy9HCdMb9y35t4mSPFYcb357aU XacFBrCYzfPxv554bn+cfUedrCqDfAhjnMba3oTcYt/PF89MlnzRJDOpKLhKzeZyS6Fr2j U3w56UaYEbONkNi7eD+HhQo9GpSG5cWoVQgqQm0GhxC4mp319G0uB7/W22EXbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682791862; 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=onifTwhC1zRluxUt573QI+HxHM2yUnJCSHLvbYjYlok=; b=t289pfI7H5B7+je+JDd9gL2efj7UAr2apuBi9mHqJ+4Mo1VWhe5XboAW7a2SaoMuf8J24R mLniUO8swZ+W6MHzGDFsBTPM/N+ENe2M/mmeXz8S9sO7RJrZ1I2e9bAnOAA0m/gbiDer53 2L5QRi5XoF9WI3nBRCEXXEvwYeYglCLXrlSpg0Z17Vk2EBge9mt+Z9UDnAkm4XDcE/yrCA 4EwfxQp800JkKeoOTbsu4rHfPM6brmoFWzQjIW40vSKxZxUJwsU1yzAOIpW1U1w+v98dnr jnQ1Yz4KK01DArGh09ITaVbPCWh+5zN2rbom2hEMi1KcoMvSnoRHqCwVCKMu0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682791862; a=rsa-sha256; cv=none; b=nVenGzRr29NAwdg5vMU61pEAhf7L1ZiagdDUIF+dLvByBymVAngETIVJqY7JxSS/fwvt3e 16DeRiPLAYatdFZZk2MVuSvqWs5251rHz2V0RIZi+GmWLNWqax6Py4r4m0y+53jMd6AKon RImkQZWuh//7Sf5lSw74jqy56wCoQbcH1ZmSnv7vkVtcJnJ6aj0QRw3IBfTUjrHv8l3cNM y+hpifZJ4yw3W/1WCtAGmhoIGCvyx63PXqr2/ms9FXysCOpF32UDXcymOkFm0tAJJth9fQ ex4SVv9mKV7OwLSlahHJ0LVrYR6rjvYHhX9PJJq5bqLNb28Cs30+1TolVAvt6A== 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 4Q7yFy2W6wzrY5; Sat, 29 Apr 2023 18:11:02 +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 33TIB2bh016455; Sat, 29 Apr 2023 18:11:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TIB2mV016454; Sat, 29 Apr 2023 18:11:02 GMT (envelope-from git) Date: Sat, 29 Apr 2023 18:11:02 GMT Message-Id: <202304291811.33TIB2mV016454@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: b180a0773bef - stable/13 - Bug fixes for fsck_ffs(8). 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: b180a0773bef95880e06b0ee4a1635ab6c077175 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=b180a0773bef95880e06b0ee4a1635ab6c077175 commit b180a0773bef95880e06b0ee4a1635ab6c077175 Author: Kirk McKusick AuthorDate: 2023-04-18 06:03:30 +0000 Commit: Kirk McKusick CommitDate: 2023-04-29 18:09:01 +0000 Bug fixes for fsck_ffs(8). Sponsored by: Netflix (cherry picked from commit 18746531a881356ed24b6ef2fdc9e50707642163) --- sbin/fsck_ffs/fsutil.c | 4 +++- sbin/fsck_ffs/inode.c | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 44b3e50da012..8f5b09cfe610 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -319,8 +319,10 @@ getdatablk(ufs2_daddr_t blkno, long size, int type) * Skip check for inodes because chkrange() considers * metadata areas invalid to write data. */ - if (type != BT_INODES && chkrange(blkno, size / sblock.fs_fsize)) + if (type != BT_INODES && chkrange(blkno, size / sblock.fs_fsize)) { + failedbuf.b_refcnt++; return (&failedbuf); + } bhdp = &bufhashhd[HASH(blkno)]; LIST_FOREACH(bp, bhdp, b_hash) if (bp->b_bno == fsbtodb(&sblock, blkno)) { diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index a46fea0607a0..37b0f9ebc1b1 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -747,6 +747,7 @@ snapremove(ino_t inum) bzero(&snaplist[i - 1], sizeof(struct inode)); snapcnt--; } + memset(&idesc, 0, sizeof(struct inodesc)); idesc.id_type = SNAP; idesc.id_func = snapclean; idesc.id_number = inum; @@ -767,14 +768,15 @@ snapclean(struct inodesc *idesc) if (blkno == 0) return (KEEPON); - bp = idesc->id_bp; dp = idesc->id_dp; if (blkno == BLK_NOCOPY || blkno == BLK_SNAP) { - if (idesc->id_lbn < UFS_NDADDR) + if (idesc->id_lbn < UFS_NDADDR) { DIP_SET(dp, di_db[idesc->id_lbn], 0); - else + } else { + bp = idesc->id_bp; IBLK_SET(bp, bp->b_index, 0); - dirty(bp); + dirty(bp); + } } return (KEEPON); }