From nobody Tue Mar 05 00:19:04 2024 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 4TpblY24cQz5DYtc; Tue, 5 Mar 2024 00:19:05 +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 4TpblY1H6Mz4KQS; Tue, 5 Mar 2024 00:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709597945; 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=tTyrZXnmp7tAOz/aLeuJi7dDLrweOMghUpeuXhwo5n8=; b=lCXXj6Rf9JG1ytDogWCo+58xpG9lHF7SLKPfhvf8DxL6mbkhK6TAMSBZGXZxuDwtfkhbXr X1abyhaooxZ8FveDhJAi/NH4L70CkfLl+320O91H4DY6J3+3WhZSXEIpuzlxiyekPFs1OT 0PtoXVCM3AYyZ997AByoyxVbgm9svTjBWcH+xN6zgd2FbcgxzXI8b6kHmrlhO+M3gs9SiA lJBvmgb/HXHBPfdDFzBUEVZwzaKLSsao5UVs4bMJXQn49eutzi+PRf1wJsdPawdTOx84dH 0/W+/6HhPXYlD67jxBa6ggcZ2JMMMMNyGxEBSfuXVBIv4P9bOlAaLBEfa2fRRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709597945; a=rsa-sha256; cv=none; b=ojwyrStGlzkVSope7Bta8XziX6+p0mqI3ElWHPAXvsVn+080uE8ZKE9iesu8PDt+GCN5s/ PsX/dI7PAE2gtwmsmXypioYA7htzXDrq2OWhRyUxtKseadiB0za9A7SySn3LQlc0E8bOWs pqVYJqK3GX3T6CjES5oOpJ68zdmkh5AW9f5bnQRO+bS4BwEaXLbwdWpDjEgJZRXlXf3Gxr gB7OQhmdXud7PO3AtrUB7VUB7ave25UnvCiubG0fMgYTl4QZJbiuRrxfjynbyZUzFbJETZ 8lvlrvOKMQmuME7vSWsEssTCWP9aPm1SGEfrm5Q3EV3+2UFiZQbzgfNEBRiwwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709597945; 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=tTyrZXnmp7tAOz/aLeuJi7dDLrweOMghUpeuXhwo5n8=; b=H0ohYcJ9YOTFBHGbOHkUC+fmR4mZxJ3xj8ImUUPw9inkZWK9uJZBPZHCcZB0x8JA5NQRLe m8p+psvpDQq5IYZmO7ybNNcQ0Xv3nmJEXE6Ht55EocWj6VnwwuG0wDNYmLgvdSBBy6j1Lt YscWfwbR/lNvmCOA/wOPpKcpbp16ct9/xWCH3ZzqLhbdhxLomf2XIOnQKNaQhfG5NKOj5j /0R35o9OZ3uoZAbGTI0zGpWtKEmTV2/Oh3NUQSx0XYH6/zmIAGtKFTQ1giOYkKz4lBfofr B+lUGLsMlnn+NArtiIBdJGf7a2W0pT7gIl6Lm36He+jF548UAXPhYmp5zbQXFQ== 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 4TpblY0ZqLzjT6; Tue, 5 Mar 2024 00:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4250J4aA054917; Tue, 5 Mar 2024 00:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4250J4t5054914; Tue, 5 Mar 2024 00:19:04 GMT (envelope-from git) Date: Tue, 5 Mar 2024 00:19:04 GMT Message-Id: <202403050019.4250J4t5054914@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: 8c6964b779ce - stable/13 - Eliminate unnecessary UFS1 integrity checks. 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: 8c6964b779cecbcf42475c896e5c61df192b80b9 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=8c6964b779cecbcf42475c896e5c61df192b80b9 commit 8c6964b779cecbcf42475c896e5c61df192b80b9 Author: Kirk McKusick AuthorDate: 2024-02-20 00:16:07 +0000 Commit: Kirk McKusick CommitDate: 2024-03-05 00:18:58 +0000 Eliminate unnecessary UFS1 integrity checks. The UFS1 integrity checks added in FreeBSD 14 were too aggressive for UFS1 filesystems created in FreeBSD 4 and 9 systems. This patch removes those tests which can be done safely since they are not relevant to the current implementation of UFS1. This is a follow-on report to bug report 264450 (comments 21-28). Reported by: slb@sonnet.com Tested by: slb@sonnet.com PR: 264450 (cherry picked from commit b241767f8ef38f9ca7c109fe2fccd11ccbfaa4f0) --- sbin/fsck_ffs/fsutil.c | 2 -- sys/ufs/ffs/ffs_subr.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 14196fa8356a..5252fc8d0917 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -1023,7 +1023,6 @@ check_cgmagic(int cg, struct bufarea *cgbp) CHK(cgp->cg_ndblk, >, sblock.fs_fpg, "%jd"); if (sblock.fs_magic == FS_UFS1_MAGIC) { CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); - CHK(cgp->cg_old_ncyl, >, sblock.fs_old_cpg, "%jd"); } else if (sblock.fs_magic == FS_UFS2_MAGIC) { CHK(cgp->cg_niblk, !=, sblock.fs_ipg, "%jd"); CHK(cgp->cg_initediblk, >, sblock.fs_ipg, "%jd"); @@ -1040,7 +1039,6 @@ check_cgmagic(int cg, struct bufarea *cgbp) } else if (sblock.fs_magic == FS_UFS1_MAGIC) { CHK(cgp->cg_niblk, !=, 0, "%jd"); CHK(cgp->cg_initediblk, !=, 0, "%jd"); - CHK(cgp->cg_old_ncyl, !=, sblock.fs_old_cpg, "%jd"); CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); CHK(cgp->cg_old_btotoff, !=, start, "%jd"); CHK(cgp->cg_old_boff, !=, cgp->cg_old_btotoff + diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 29349f69fb96..ad9128f06266 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -398,10 +398,8 @@ validate_sblock(struct fs *fs, int isaltsblk) CHK(fs->fs_old_cpc, !=, 0, %jd); CHK(fs->fs_old_postblformat, !=, 1, %jd); CHK(fs->fs_old_nrpos, !=, 1, %jd); - CHK(fs->fs_old_spc, !=, fs->fs_fpg * fs->fs_old_nspf, %jd); CHK(fs->fs_old_nsect, !=, fs->fs_old_spc, %jd); CHK(fs->fs_old_npsect, !=, fs->fs_old_spc, %jd); - CHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd); } else { /* Bad magic number, so assume not a superblock */ return (ENOENT);