From nobody Wed Aug 17 20:54:31 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 4M7KyH2TTZz4ZFBZ; Wed, 17 Aug 2022 20:54:31 +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 4M7KyH1z3gz3GRN; Wed, 17 Aug 2022 20:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660769671; 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=1Kb80R1nI9PcANOqs6qT8bdpzoWwpKC04I5Xv3HGpfQ=; b=rNTmtTsR/Yf4rcgw4qvpFrN5z84XmcZP1znto8j2yI9yxifszFKK33tdfpTnJ/SixEHA6o nCWni38z43I0VVx0iaWBzhd9CWFR4rpOtTnsRgcQhCoRKMHLWGy5/Vx+mTx3k4+Hr9vVDg K73tqB206fkCWVNZxOi+OXlNg+WGoPhpQnZ+dGKDo+59Hse0z0qoFjIk1WMgMRl6lV7R6J K6FFipgHHSnStI4Hl5nNWPHzbn6UuiVjPIbT0AKnCTw0Y+uBd5RGE1MNm5BGdXkg/CnTrF C+HRor1tj/OaHdz4JWePXCiuGPRtB8pAwj8kDqZ6OFXYkmoxywuk3OoQulvkOA== 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 4M7KyH10bBz13xv; Wed, 17 Aug 2022 20:54:31 +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 27HKsVB2083667; Wed, 17 Aug 2022 20:54:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27HKsVUX083666; Wed, 17 Aug 2022 20:54:31 GMT (envelope-from git) Date: Wed, 17 Aug 2022 20:54:31 GMT Message-Id: <202208172054.27HKsVUX083666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 4f9606c9a615 - main - When reading backup UFS superblocks, report reason if they cannot be used. 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/main X-Git-Reftype: branch X-Git-Commit: 4f9606c9a6155075847b9dc3e5cb67906484195c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660769671; 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=1Kb80R1nI9PcANOqs6qT8bdpzoWwpKC04I5Xv3HGpfQ=; b=gL4yHiP3s1XekLYbNoajzFL64QFpr0cyk5JUNiMgb1ZM8AnLdsZ4eo8dKJNG/B/oCf+Edq 2+5AB506cfUjQrI8OkLKCI5G336vGM1J582Jp0+4i92w2AYKyKXcA+wE8NQizhdIqqWILG yyjvebCR5WMOQzdaE2ujwn02k7kT8vvgurKtk8i/yUPf22/UcHo69iMZt2Lm8OdaK4zXTm ePiz8XBfwDXusJMX/i7l3plZKOyw0S2Jjb7dxarKL/epCYc4ko0H3ERcvNHHr1EkKolC51 gW6/VLyEgHc6ESSPlI5ocAiiK2Pp8Jx7Q2DKJoWXVK6hhEe0MN6s38UCyHY0og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660769671; a=rsa-sha256; cv=none; b=GNwXEiOHR2Jz10yAix335b9o5fmZ3Jar34wYUZGVk0g+b+9CNaZ0jyuUhiN2n7IFlLm70y SnnyofJsMGTqMTsBPFYibgWg9B9QNumnxWg8Kov6Hoyv00WPXy6PtsqEL9WKKHMpwMmMPZ OvgU0tNVNYSp0FTSbCPpzP2r7IBsaw49b5rxCVMuz8GI77APA8rBqg5j3A/moe4CSYXKhN pnbRCjbLAb22WALnO3ImGVaixbf0v4Wab9FKaQ7tt9B1g+Egag0DkRKQCUV9oTIS7tWzKN GxD3Ra68MOge8cYWs/qGPPvVI4gM+730wbj05l1wqaXSoZsbJPoq4TN23g08cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=4f9606c9a6155075847b9dc3e5cb67906484195c commit 4f9606c9a6155075847b9dc3e5cb67906484195c Author: Kirk McKusick AuthorDate: 2022-08-17 20:52:41 +0000 Commit: Kirk McKusick CommitDate: 2022-08-17 20:54:07 +0000 When reading backup UFS superblocks, report reason if they cannot be used. When either searching for backup UFS superblocks or when explicitly asked to use one with the -b option, report the reason for failure if it cannot be used. Reported by: Peter Holm Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 3db59e611729..69b027a3a5c8 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -230,7 +230,7 @@ readsb(void) * If bflag is given, then check just that superblock. */ if (bflag) { - switch (sbget(fsreadfd, &fs, bflag * dev_bsize, UFS_NOMSG)) { + switch (sbget(fsreadfd, &fs, bflag * dev_bsize, 0)) { case 0: goto goodsb; case EINTEGRITY: