From nobody Mon Mar 11 20:51:00 2024 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 4TtppD4kwvz5DhZd; Mon, 11 Mar 2024 20:51:00 +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 4TtppD4FZ1z57x7; Mon, 11 Mar 2024 20:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710190260; 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=JHJYzEcD2xAuF76RLSwJpM+BZy4bGPGKnVw+T72DjT0=; b=Dp3CwJfGADwiL4AsgM04Gt4gnK5JEoYP0a/4jnAs+iNJEdL9RgM38FBwQaa3IRXZ8xYkMG 0qcCHY8nNGZ25WYVOyRTNBKLMoqQ3hp0Zh2ibGottxLIW9d0fR1W5aRcmacVMGX7CFRCyo otE3xtEqvoLjcbqEroC302yUcfwbB2F8h3XN/pSjMEZjFRu0nvwBapXu53WYMhigxIsGRT /xXkdqz5wQ61e8UH6Ns0hFKcn2ts8GVJF5d+8Rvl0i8J0kdsWrAPnuUuKvMKO4uc/80GD6 dXLLj+fD1hSiqM7ztN0Fr8Ch23pE6xIfXWqPvl/VhvRq0DUNDQAiMQEnmfBwOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710190260; a=rsa-sha256; cv=none; b=CCVyc/d6ppA0l0ogOB0vXB+wY6iN8/y0Y3XsMdUMFkpMVgtPm0VHIJX/cPoKNRjMD8srM+ uCFh/iqeDFUMoTTQPZZKCEF8DQYFUiX7FDMdgg59D9kzhU9x8MK+2D1VtSRrosct50rmNn xOX2vTvrB0Dx+NQWZ0D7U1rVXKNMWdQqf6Zu9a73GERqyGXLGzO3hgvUg77tH4z14gkKCK 0FN6aIQbTU5v4f1T4HaXzMCm2XkaN4wNCw/WwdcHFKKHputCq4wbgOxM9yo3+CL07zatfw zGqANJEDsx28iazdecEjo+fxcmBJFsR9VSusM72uJB6/xghBR/yNb0yxLBZwRw== 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=1710190260; 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=JHJYzEcD2xAuF76RLSwJpM+BZy4bGPGKnVw+T72DjT0=; b=pLR2XRjBPyGUgVf4kTm3gJwdY8htNZsC1Ao/NxkTwx1+4og58LwkffG61auHC/41FNEwCW UTuzIASGHaLzzR8lFzVyaDdT7JgmY8Lqh1h6IAeCcnGBCAaWSjCMcaweYbyeUnWYLbiByM E7LPZvytFGafUrXr0o2OIjcnGRqOjBf13WZQG8BrO9tSWZ7L40UIcauF2JLvQOY/+Q03+x UqGjnxjdcXf2FsUxGZxqDo1k3fZBbaaT5gfvQjgi1DytXAbG8Ix5elS94sn43rQXGOB9dp edlMwtIc4bawUZX0Y+K1YtIfBxoXGBkQ4wNfy7DM6SdPCdj3e3rIX4mkRNZW9w== 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 4TtppD3rxrzlNk; Mon, 11 Mar 2024 20:51:00 +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 42BKp012066775; Mon, 11 Mar 2024 20:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42BKp0PP066772; Mon, 11 Mar 2024 20:51:00 GMT (envelope-from git) Date: Mon, 11 Mar 2024 20:51:00 GMT Message-Id: <202403112051.42BKp0PP066772@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: 9cfb9a34bf15 - stable/13 - Eliminate unnecessary UFS1 integrity checks. 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: 9cfb9a34bf154b27d21f9e2dfe8d2704ab664ed4 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=9cfb9a34bf154b27d21f9e2dfe8d2704ab664ed4 commit 9cfb9a34bf154b27d21f9e2dfe8d2704ab664ed4 Author: Kirk McKusick AuthorDate: 2024-03-11 20:49:57 +0000 Commit: Kirk McKusick CommitDate: 2024-03-11 20:50:48 +0000 Eliminate unnecessary UFS1 integrity checks. This was missed in the cited cherry pick. This is a follow-on report to bug report 264450 (comments 21-33). Reported by: slb@sonnet.com Tested by: slb@sonnet.com PR: 264450 (cherry picked from commit b241767f8ef38f9ca7c109fe2fccd11ccbfaa4f0) --- sys/ufs/ffs/ffs_subr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index ad9128f06266..ca595ed5bd80 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -392,7 +392,6 @@ validate_sblock(struct fs *fs, int isaltsblk) CHK(fs->fs_old_rotdelay, !=, 0, %jd); CHK(fs->fs_old_rps, !=, 60, %jd); CHK(fs->fs_old_nspf, !=, fs->fs_fsize / sectorsize, %jd); - CHK(fs->fs_old_cpg, !=, 1, %jd); CHK(fs->fs_old_interleave, !=, 1, %jd); CHK(fs->fs_old_trackskew, !=, 0, %jd); CHK(fs->fs_old_cpc, !=, 0, %jd);