From 97b0512b23f039252cf6f622486f07858cd4ea1f Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Sat, 13 Jul 2019 14:42:09 +0000 Subject: [PATCH] projects/fuse2: build fixes * Fix the kernel build with gcc by removing a redundant extern declaration * In the tests, fix a printf format specifier that assumed LP64 Sponsored by: The FreeBSD Foundation --- sys/fs/fuse/fuse_main.c | 1 - tests/sys/fs/fusefs/mockfs.cc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/fs/fuse/fuse_main.c b/sys/fs/fuse/fuse_main.c index de2e54cf6c77..cf3236089e8d 100644 --- a/sys/fs/fuse/fuse_main.c +++ b/sys/fs/fuse/fuse_main.c @@ -95,7 +95,6 @@ struct mtx fuse_mtx; extern struct vfsops fuse_vfsops; extern struct cdevsw fuse_cdevsw; extern struct vop_vector fuse_fifonops; -extern struct vop_vector fuse_vnops; extern uma_zone_t fuse_pbuf_zone; static struct vfsconf fuse_vfsconf = { diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index e4f28b9563d0..f219cb3f9546 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -169,8 +169,8 @@ void MockFS::debug_request(const mockfs_buf_in &in) printf(" mask=%#x", in.body.access.mask); break; case FUSE_BMAP: - printf(" block=%#lx blocksize=%#x", in.body.bmap.block, - in.body.bmap.blocksize); + printf(" block=%" PRIx64 " blocksize=%#x", + in.body.bmap.block, in.body.bmap.blocksize); break; case FUSE_CREATE: if (m_kernel_minor_version >= 12)