svn commit: r349970 - in projects/fuse2: sys/fs/fuse tests/sys/fs/fusefs

[Alan Somers]

Author: asomers
Date: Sat Jul 13 14:42:09 2019
New Revision: 349970
URL: https://svnweb.freebsd.org/changeset/base/349970

Log:
  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

Modified:
  projects/fuse2/sys/fs/fuse/fuse_main.c
  projects/fuse2/tests/sys/fs/fusefs/mockfs.cc

Modified: projects/fuse2/sys/fs/fuse/fuse_main.c
==============================================================================
--- projects/fuse2/sys/fs/fuse/fuse_main.c	Sat Jul 13 12:48:28 2019	(r349969)
+++ projects/fuse2/sys/fs/fuse/fuse_main.c	Sat Jul 13 14:42:09 2019	(r349970)
@@ -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 = {

Modified: projects/fuse2/tests/sys/fs/fusefs/mockfs.cc
==============================================================================
--- projects/fuse2/tests/sys/fs/fusefs/mockfs.cc	Sat Jul 13 12:48:28 2019	(r349969)
+++ projects/fuse2/tests/sys/fs/fusefs/mockfs.cc	Sat Jul 13 14:42:09 2019	(r349970)
@@ -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)