From nobody Tue May 27 23:13:15 2025 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 4b6T2M5dmrz5y24S; Tue, 27 May 2025 23:13:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6T2M4T4bz3XgF; Tue, 27 May 2025 23:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748387595; 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=2D+5zSD7JSZ339veNxd4w7+G3N0AYEU2U5mx0Udw/34=; b=r8+OkHATeVmwrfMK+Fkw8RK+XVfhwP11SCsKXEWOdxkcW5sT7aHekqoWTLKjJRI5xeJu49 vIAH0kHspz509+xEPBwbvvAkJu2TTX9TlzCMOAmjisyO1Mwx94ZvNo0ReO6/We2+TRQmJ6 5CxBrTI+kFJ+A6qGN589em8t+Yuv01fY0RuH4UXfWzarQAtOaseuEFl0I5x6LWEzhlzFZg AVchZKw/JYEJp7UOw8iXzho7K/u0Ex4OFzyWG0n9xnTYxcdJPYuKiu+1rt2FaRAnN64Uo4 4EuScVsqHpVVQsYo3lDJ9dIbIdeGHMfAd4NSzKghfDCsXEE/59+ndK+n3j3rCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748387595; a=rsa-sha256; cv=none; b=Dg34Rf/3LOOzLGFKYmz1B5k0CPutL2kcZtzGvNItzYvbsHyaWovchHuZdHHfmyPVpEBE8J Reary0XhEbiQwaImd5gbSHbIk0sVQqx7i1cusVvwP+kIJ6GPwUuDNPXdUD+y7Kk9c+X6Hb NUbY2yF7B6WCwXxpcZ5jlsOfMLNapCpPzuOW8mbColFl+uhrFnTjG6Sw0Ei3ho+EE+8FpG vKeJio0Qo7LP0Mp9SrxY2Nng91gigC4eAWmMjnrOuQCh5ZXJq16Hmz2wsM2uCr+gqXJzme NFKqq0DFiWpaBMn4/eqGg1+Wf1btRSadW12qkoRUh9zuJAX4HaU/+Li3veVvUQ== 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=1748387595; 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=2D+5zSD7JSZ339veNxd4w7+G3N0AYEU2U5mx0Udw/34=; b=Gw6ErT76uhuFdLkk0MEbJjq51nYUcNE9VfiWutH02yTWYawhovTFiFLvpz9HJQxNdxm1PD hRSboz35apOHYxM96sJOq3rJwp+/Hcy6J8B0+olzE0lIA0dTHlvidlOw6DcVqrXZE8MnEG UZEBIAyOAzgfH9AlXPM/TKACaet9ZvI+fqVrI6sIY8R4NllblnHafuQP0NiuOWRaP3s2X1 R3xUCuEn5nSvSjpvJ2FexoeZBYEwZH7ZZ+PD9ukpVbK1WaLN8yTAFrwRBYXfKxJJ+lISCf SsXMiLF4WC8M3/zHkhhxCOhzOig0kPcKf3Kkjn+8c1mkG5f5p9uRYaXN+kBKAg== 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 4b6T2M3nQfz1BKF; Tue, 27 May 2025 23:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54RNDFSm004381; Tue, 27 May 2025 23:13:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RNDFNF004378; Tue, 27 May 2025 23:13:15 GMT (envelope-from git) Date: Tue, 27 May 2025 23:13:15 GMT Message-Id: <202505272313.54RNDFNF004378@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: c0f7e69d60d4 - main - tools/diag/prtblknos: fix build 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0f7e69d60d48c17916ce5c2578808ce959ecc32 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=c0f7e69d60d48c17916ce5c2578808ce959ecc32 commit c0f7e69d60d48c17916ce5c2578808ce959ecc32 Author: Robert Wing AuthorDate: 2025-05-27 23:12:04 +0000 Commit: Robert Wing CommitDate: 2025-05-27 23:12:04 +0000 tools/diag/prtblknos: fix build The build was broken by two separate changes: aa90fbed151de512ab6e59f75df009533a15751f 772430dd67955850942d689714ab982da24257ba --- tools/diag/prtblknos/main.c | 7 +------ tools/diag/prtblknos/prtblknos.c | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/tools/diag/prtblknos/main.c b/tools/diag/prtblknos/main.c index c04b0812d6c6..bfd28206a555 100644 --- a/tools/diag/prtblknos/main.c +++ b/tools/diag/prtblknos/main.c @@ -32,11 +32,6 @@ #include #include -union dinode { - struct ufs1_dinode *dp1; - struct ufs2_dinode *dp2; -}; - void prtblknos(struct fs *fs, union dinode *dp); struct uufsd disk; @@ -81,7 +76,7 @@ main(int argc, char *argv[]) if (ufs_disk_fillout_blank(&disk, fsname) == -1 || sbfind(&disk, 0) == -1) err(1, "Cannot access file system superblock on %s", fsname); - fs = (struct fs *)&disk.d_sb; + fs = (struct fs *)&disk.d_sbunion.d_sb; /* remaining arguments are inode numbers. */ while (*++argv) { diff --git a/tools/diag/prtblknos/prtblknos.c b/tools/diag/prtblknos/prtblknos.c index e0d7a7389b48..acd0c1e1a61d 100644 --- a/tools/diag/prtblknos/prtblknos.c +++ b/tools/diag/prtblknos/prtblknos.c @@ -33,10 +33,6 @@ #include #ifdef PRTBLKNOS -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; extern struct uufsd disk; #else /* used by fsdb */ #include