git: c0f7e69d60d4 - main - tools/diag/prtblknos: fix build

From: Robert Wing <rew_at_FreeBSD.org>
Date: Tue, 27 May 2025 23:13:15 UTC
The branch main has been updated by rew:

URL: https://cgit.FreeBSD.org/src/commit/?id=c0f7e69d60d48c17916ce5c2578808ce959ecc32

commit c0f7e69d60d48c17916ce5c2578808ce959ecc32
Author:     Robert Wing <rew@FreeBSD.org>
AuthorDate: 2025-05-27 23:12:04 +0000
Commit:     Robert Wing <rew@FreeBSD.org>
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 <sys/stat.h>
 #include <libufs.h>
 
-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 <libufs.h>
 
 #ifdef PRTBLKNOS
-union dinode {
-	struct ufs1_dinode dp1;
-	struct ufs2_dinode dp2;
-};
 extern struct uufsd disk;
 #else /* used by fsdb */
 #include <fsck.h>