From nobody Mon Jul 25 01:12:56 2022 X-Original-To: dev-commits-src-main@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 4LrhqX4DHMz4WvDq; Mon, 25 Jul 2022 01:12:56 +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 4LrhqX3fsfz3MGw; Mon, 25 Jul 2022 01:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658711576; 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=OqnCPijV7RpVOGy5eUFmvzoHH7cJB4cm8G2pLOeamyg=; b=b4+YEF4XPDN37GOnPKl8mYh4dalro9jjpl4OahVA6shH5aJ0CuZTttRBaf+qi4+LLTCxD2 AWDXpdEoMBPFp1QS+Rb/f2VmM2szhdMnlBTuSXn9e7sPE90/jHQaGB45Rc8vmNw42AWLyW wSWx9H3rqY4AWzg3auRpuTFGYI0sbE5dSVQSkAB8R8u7D90qBxZygsmqHA9QZQywFbPwYV 1BmdG+r5Nekn2FKnnrWghhPCMWFgxdU0dRExSUljO9oQBDoAWCSRx7SVuBhDUM4m5hwrNM xo0xZIwhHCnuxWXqH2GVE25LmEAndnJWYcWArfFZiZ8yZ9TV49aB9PT3jQjFZg== 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 4LrhqX2THjzfVc; Mon, 25 Jul 2022 01:12:56 +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 26P1Cu79093607; Mon, 25 Jul 2022 01:12:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26P1CuG6093606; Mon, 25 Jul 2022 01:12:56 GMT (envelope-from git) Date: Mon, 25 Jul 2022 01:12:56 GMT Message-Id: <202207250112.26P1CuG6093606@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: bf24d17fda75 - main - Have dumpfs(8) ignore superblock check-hash failures. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: bf24d17fda75cc89a92248715d52a73f23adc89c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658711576; 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=OqnCPijV7RpVOGy5eUFmvzoHH7cJB4cm8G2pLOeamyg=; b=WglYyfweSZEZYP3BP4JObpbPUquPsRDKhH8Fwmbv6IDxXSqhqFR5cc2gGMnnnCX723vpAG xs6fTdwGDHxKe8ojpf7FYaTvPqy9x3uju1duTv5E5SYwTOqBn2CE7E4DFqiM0iaSsy1dRe Y0xFXxtabCzYAvdByLojw91Nbw3YIWz2mPGvXtcHwoDTD9BsFA83Ufjcdy00SBuovYEG7B dxUuwr5QcDRqA24N9VxzN5bkGrymOW2iTvkzBUeJ0xpEHkVnIxrZ2qqY73n4z6DEX1VHky 1V4QnKdZvVz+GnPFWe1kxs2gIpzM3APrqSqLL0ra0vErC+MeydnFKa86/lFHlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658711576; a=rsa-sha256; cv=none; b=mrlGfjoOcEUyyBhQ8ZnJZRhs6MrShUGF2Wag5R0b9QvF6r/2icyXj0bLQp0rLMiAg/v7WJ NZKpKljaC7V0LgbQtA7EvNqK6kvh0Z5fS2LC6LDaqJ7lNyy/OivtPdQKLCfeACi1SJSTep Gibi+/QbUvwFMF0eChi2x+PBchcQAK+RQLLI35OBPpu8pJCC2UNp8QNCINVSER2+mGbH5R Fi80J/dt5nZqMQCA5cK1pWAY618cY+b5rMCip3aL1F8IOG5+/30EdGJXCgvOU2+qwUS32O 90AQg29Egkj2gcc0x9Y5W/R69+zwSLlUp2C7rhWBrYecl5rDe2O/qraFSkwfvw== 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=bf24d17fda75cc89a92248715d52a73f23adc89c commit bf24d17fda75cc89a92248715d52a73f23adc89c Author: Kirk McKusick AuthorDate: 2022-07-25 01:01:43 +0000 Commit: Kirk McKusick CommitDate: 2022-07-25 01:12:24 +0000 Have dumpfs(8) ignore superblock check-hash failures. Set the STDSB_NOHASHFAIL request so that dumpfs(8) can print out filesystem details even when the superblock checksum is incorrect. --- sbin/dumpfs/dumpfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 99b4ad0b9274..7f2acdf435ea 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -130,7 +130,13 @@ main(int argc, char *argv[]) usage(); while ((name = *argv++) != NULL) { - if (ufs_disk_fillout(&disk, name) == -1) { + if (ufs_disk_fillout_blank(&disk, name) == -1) { + ufserr(name); + eval |= 1; + continue; + } + disk.d_sblockloc = STDSB_NOHASHFAIL; + if (sbread(&disk) == -1) { ufserr(name); eval |= 1; continue;