From nobody Fri Feb 04 22:47:19 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 457E319B47EA; Fri, 4 Feb 2022 22:47:20 +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 4Jr9f01Rm8z3vgB; Fri, 4 Feb 2022 22:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644014840; 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=QwmBFSSf20U+MsydxG+nZWKYSPlnGjj8ADdyigyK1lU=; b=h2oKadbj4HL479erHfY/ZWBXj3kjJ7XhunJ/l3HMD/a6MPF+zef6GmL03SZXbthlwwSzx+ Me472/FXZEh41LWK4F259kmeVNp7BfuM0GySAjq9T3bpQOfJikgEqxXUifua8KgNIpBxL3 fXOu3Aw43AZbeO2dLV5Y2sH/ZJpNV1DMca6Wq+iJYZ9VumuNUg+yL5FMoeRmFa2fAo2kca mk/qusSkEsU1isBeG+4w+gMk8sgRAhHoMb+TTg+W7n+NqCmSA1Q+HHTvSZ85fgBuVwDcPD cmoKWFbqs6WfR8U8a4LWalQ5z5CUx7mBQ5nWIJtliDEku2/iW8FkYqKJHeYHrw== 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 0D4D914407; Fri, 4 Feb 2022 22:47:20 +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 214MlJtA019939; Fri, 4 Feb 2022 22:47:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 214MlJrU019938; Fri, 4 Feb 2022 22:47:19 GMT (envelope-from git) Date: Fri, 4 Feb 2022 22:47:19 GMT Message-Id: <202202042247.214MlJrU019938@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: 57b0fc30676f - stable/13 - Avoid unnecessary setting of UFS flag requesting fsck(8) be run. 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: 57b0fc30676f98dcb2c2dec2dcc21b1c93a69b73 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644014840; 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=QwmBFSSf20U+MsydxG+nZWKYSPlnGjj8ADdyigyK1lU=; b=OMEVOJVekGa9KBGJf8Z9mgMOReu/XG6e9dRQ9BT/23kpdISXp5IA7lWq4PNVedL+0p92sS ClsSzrzwGhmQrxssd2qAEadJaS8/8TW6jKFv18q5lssSH2BXHnQVQpj0hmh9iIvv7OpB++ jdrexnE8f0HgjVGXQCvjypvVKq0N29OIyVzvvxLRo+/XTUny9zEpmADU9mq/KA1ABWfvo2 wxEeGFwZ4Q/HyXIL/u8gSkxja287aiTPTpPyueHQLWOfx5Q4ZonUOFiHIzSlomWkOe6s9+ 1YX/UlIWlVbgg53aI2IgIE82IQVloUjnWLG90zo/wPDIPnPvXLpRtgSOKEYyUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644014840; a=rsa-sha256; cv=none; b=H2ZB5GrB+Ys1085gFcXa3a7i/F+v1p8flwor1MUlCORdc7P4rujYcveonzWwLcyp98ClMj lBGgYZEm/FlEzT/L7yWhKEN8v/VArrigh0GxhF3wLZsInKV9Ppg/6/z2jqv0jOsvqTALuR Dl7VdaRfRMb0DQnUbvdKdwLRJWd9TbgMbjP7U81FQFIe3v5AJXvHp9PMBswYFbDKo5cNtg jPLRGWBxnWdzAVDGIJKgkBxJt0UNYjpDz0BkxGv/wJ3UgJRhlvMRXx9w/RNgtN5YuBaJJL vlmUkxBkCyxup9NkNXo5Y9EEkmOXG/iJwi+3MiZMMbEn8AuTHgzYa6fknA7nxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=57b0fc30676f98dcb2c2dec2dcc21b1c93a69b73 commit 57b0fc30676f98dcb2c2dec2dcc21b1c93a69b73 Author: Kirk McKusick AuthorDate: 2022-01-10 00:17:13 +0000 Commit: Kirk McKusick CommitDate: 2022-02-04 22:45:49 +0000 Avoid unnecessary setting of UFS flag requesting fsck(8) be run. (cherry picked from commit 7ef56fb0498461edf4bf4c482fd8bc6fa126e0e9) --- sys/ufs/ffs/ffs_subr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 3e6cefa7be0c..361746571fdf 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -301,12 +301,9 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int isaltsblk, "check-hash 0x%x != computed check-hash " "0x%x%s\n", fs->fs_ckhash, ckhash, chkhash == 0 ? " (Ignored)" : ""); - if (chkhash == 0) { - fs->fs_flags |= FS_NEEDSFSCK; - fs->fs_fmod = 1; + /* STDSB_NOHASHFAIL */ + if (chkhash == 0) return (0); - } - fs->fs_fmod = 0; return (EINTEGRITY); } /* Have to set for old filesystems that predate this field */