aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2023-02-02 20:36:01 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2023-02-02 20:39:10 +0000
commitfb53e7adaf5b45ca08f650babc40077deff5e9af (patch)
tree3f507e73e03f5ef5af028b70c1741bff9b1212ea
parent7da605ec03c14362c3e957989b59b3084e28697b (diff)
downloadsrc-fb53e7adaf5b45ca08f650babc40077deff5e9af.tar.gz
src-fb53e7adaf5b45ca08f650babc40077deff5e9af.zip
tarfs: Fix 32-bit build.
Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc.
-rw-r--r--sys/fs/tarfs/tarfs_subr.c6
-rw-r--r--sys/fs/tarfs/tarfs_vfsops.c4
-rw-r--r--sys/fs/tarfs/tarfs_vnops.c4
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);