git: fb53e7adaf5b - main - tarfs: Fix 32-bit build.

The branch main has been updated by des:

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

commit fb53e7adaf5b45ca08f650babc40077deff5e9af
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2023-02-02 20:36:01 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-02-02 20:39:10 +0000

    tarfs: Fix 32-bit build.
    
    Sponsored by:   Juniper Networks, Inc.
    Sponsored by:   Klara, Inc.
---
 sys/fs/tarfs/tarfs_subr.c   | 6 +++---
 sys/fs/tarfs/tarfs_vfsops.c | 4 ++--
 sys/fs/tarfs/tarfs_vnops.c  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/fs/tarfs/tarfs_subr.c b/sys/fs/tarfs/tarfs_subr.c
index d4bd4e702e08..0aec225dead9 100644
--- a/sys/fs/tarfs/tarfs_subr.c
+++ b/sys/fs/tarfs/tarfs_subr.c
@@ -137,7 +137,7 @@ tarfs_print_node(struct tarfs_node *tnp)
 	printf("\tvnode %p\n", tnp->vnode);
 	printf("\ttmp %p\n", tnp->tmp);
 	printf("\ttype %d\n", tnp->type);
-	printf("\tino %lu\n", tnp->ino);
+	printf("\tino %lu\n", (unsigned long)tnp->ino);
 	printf("\tsize %zu\n", tnp->size);
 	printf("\tname %s\n",
 	    (tnp->name == NULL) ? "<<root>>" : tnp->name);
@@ -146,7 +146,7 @@ tarfs_print_node(struct tarfs_node *tnp)
 	printf("\tgid %d\n", tnp->gid);
 	printf("\tmode o%o\n", tnp->mode);
 	printf("\tflags %u\n", tnp->flags);
-	printf("\tnlink %lu\n", tnp->nlink);
+	printf("\tnlink %lu\n", (unsigned long)tnp->nlink);
 	printf("\tatime %d\n", (int)tnp->atime.tv_sec);
 	printf("\tmtime %d\n", (int)tnp->mtime.tv_sec);
 	printf("\tctime %d\n", (int)tnp->ctime.tv_sec);
@@ -162,7 +162,7 @@ tarfs_print_node(struct tarfs_node *tnp)
 		break;
 	case VBLK:
 	case VCHR:
-		printf("\trdev %lu\n", tnp->rdev);
+		printf("\trdev %lu\n", (unsigned long)tnp->rdev);
 		break;
 	default:
 		break;
diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c
index fe135116c985..a45f005a2bd1 100644
--- a/sys/fs/tarfs/tarfs_vfsops.c
+++ b/sys/fs/tarfs/tarfs_vfsops.c
@@ -522,8 +522,8 @@ again:
 
 	/* extended header? */
 	if (hdrp->typeflag[0] == TAR_TYPE_GLOBAL_EXTHDR) {
-		printf("%s: unsupported global extended header at %zd\n",
-		    __func__, TARFS_BLOCKSIZE * (blknum - 1));
+		printf("%s: unsupported global extended header at %zu\n",
+		    __func__, (size_t)(TARFS_BLOCKSIZE * (blknum - 1)));
 		error = EFTYPE;
 		goto bad;
 	}
diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c
index a40499982229..a70a077424b4 100644
--- a/sys/fs/tarfs/tarfs_vnops.c
+++ b/sys/fs/tarfs/tarfs_vnops.c
@@ -255,7 +255,7 @@ tarfs_readdir(struct vop_readdir_args *ap)
 	struct vnode *vp;
 	struct uio *uio;
 	int *eofflag;
-	u_long **cookies;
+	uint64_t **cookies;
 	int *ncookies;
 	off_t off;
 	u_int idx, ndirents;
@@ -542,7 +542,7 @@ tarfs_print(struct vop_print_args *ap)
 	tnp = VP_TO_TARFS_NODE(vp);
 
 	printf("tag tarfs, tarfs_node %p, links %lu\n",
-	    tnp, tnp->nlink);
+	    tnp, (unsigned long)tnp->nlink);
 	printf("\tmode 0%o, owner %d, group %d, size %zd\n",
 	    tnp->mode, tnp->uid, tnp->gid,
 	    tnp->size);