From nobody Mon Jul 25 01:12:55 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 4LrhqW3R9Bz4WvDm; Mon, 25 Jul 2022 01:12:55 +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 4LrhqW2kbDz3M4W; Mon, 25 Jul 2022 01:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658711575; 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=UsTcraOipd4KsJ2b+6WK86Q9rBypK+FMaA35GypRPGE=; b=twuvinCYuOU3O4Fb3LR7M05rvDz/hlfPu2Daxa2tT+W7RjAe4mAIkPf3GxIf1zgZm8Y5Zv tndmmI/jiNmjWym6Ok3XSKVpn5gTUIZ3K9+B7V4FOsWGO8dMU3KD694Hmte3tRpyiNJeNA kybJPzy2qVXjbPwa90AEYylw9rrxZ3lk5VvK6WAAv4+hQp8sDD4P8UqQAUPcHRMXW9OCE1 rlaHZGB0cAk5uMyGNlY/iumvx+f1S4O4y1Dzv9Ql7n6NO2X4nDapFj2L1my3uQgKMS5AOK QGlyPVLsQjETIN1wKAODSLxutpyhjA9pIE+AzX7ZyKrAt5B4qGlqUGu4YO/+8A== 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 4LrhqW1lG4zfp1; Mon, 25 Jul 2022 01:12:55 +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 26P1CtiE093581; Mon, 25 Jul 2022 01:12:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26P1CtSa093580; Mon, 25 Jul 2022 01:12:55 GMT (envelope-from git) Date: Mon, 25 Jul 2022 01:12:55 GMT Message-Id: <202207250112.26P1CtSa093580@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: 1297a704d991 - main - Output fs_csaddr rather than fs_old_csaddr for UFS1 filesystems. 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: 1297a704d99110644af1ae32840cee1b9523cb56 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658711575; 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=UsTcraOipd4KsJ2b+6WK86Q9rBypK+FMaA35GypRPGE=; b=sM8jFa6pqiLWOBsVO0vaHPyaR22sEwG2DeiNKbrdaueWSQjvXvrbPTYwu4HcpXz3RcYRHC A9LuEmnw69OP9nndo0hy/HBwlXLZMSpIskvtC1aIwz4gjsVVfjf84DWkrw48BvLbFDqZTk 4fxmPisEOubvShZ+E7kCotIHcQOOK/oS/XMg/e5mLzH5+w+8iWgQ7GSu5kP0jv2qhZM2Xz gC3Mm20Qku4RAsOIGy+AU/bPJmnvFEjKl4YzIRWUmSAOG10CFUwJHy+Mcd6HFfw7Qo2iGd Ik73AhZqbbHu7Fr6e7m6ziOw1aVE/fKc0AxPoWHTDA46fxiL4vcHP6kwM6tpGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658711575; a=rsa-sha256; cv=none; b=pOfZzJ6S0i3NI66221tIx5zM25ZpxGDhuPh0SBi/ph2XuqfW8bHBDfgEscdkFse5fGn3ta g4A1hEys6uJMGxaKIcnHWqE5yit0VwNuoSzozQFHkcy9S/tWkX/tqDp8fSFsi7il4WOBDE a7zJN8ghDXvkPDhYklOQ4W+lVjn2oCSAli5CDhFqsxeRa13DwwLcDeiLOl+Il0cYhTFtkA GuXnGfm6FZYzTpwPe+lEMuaAellsseD+vtFikGsDevEYRwkeDK+bKRdEH0zZHaOvrQvQt/ lmJ2ikn08RBJNUTX90RqTqk150MZoeyxhF8AVqS4drjPPH7IEVDe4pKZrygvMA== 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=1297a704d99110644af1ae32840cee1b9523cb56 commit 1297a704d99110644af1ae32840cee1b9523cb56 Author: Kirk McKusick AuthorDate: 2022-07-25 00:33:19 +0000 Commit: Kirk McKusick CommitDate: 2022-07-25 01:12:24 +0000 Output fs_csaddr rather than fs_old_csaddr for UFS1 filesystems. Since fs_csaddr is what will actually be used, show that value rather than the historic and possibly incorrect value for UFS1 filesystems. --- sbin/dumpfs/dumpfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 7c43cf4489a8..99b4ad0b9274 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -233,8 +233,8 @@ dumpfs(const char *name, int dosb) printf("sbsize\t%d\tcgsize\t%d\tcgoffset %d\tcgmask\t0x%08x\n", afs.fs_sbsize, afs.fs_cgsize, afs.fs_old_cgoffset, afs.fs_old_cgmask); - printf("csaddr\t%d\tcssize\t%d\n", - afs.fs_old_csaddr, afs.fs_cssize); + printf("csaddr\t%jd\tcssize\t%d\n", + (intmax_t)afs.fs_csaddr, afs.fs_cssize); printf("rotdelay %dms\trps\t%d\ttrackskew %d\tinterleave %d\n", afs.fs_old_rotdelay, afs.fs_old_rps, afs.fs_old_trackskew, afs.fs_old_interleave);