Add prototypes

Add prototypes/move prototypes to header files.

Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10470

4 files changed, 27 insertions, 13 deletions

diff --git a/include/os/freebsd/zfs/sys/vdev_os.h b/include/os/freebsd/zfs/sys/vdev_os.h
index e2780fdbb..59da954b9 100644
--- a/include/os/freebsd/zfs/sys/vdev_os.h
+++ b/include/os/freebsd/zfs/sys/vdev_os.h
@@ -27,4 +27,7 @@
 #define	_SYS_VDEV_OS_H
 
 extern int vdev_label_write_pad2(vdev_t *vd, const char *buf, size_t size);
+extern int vdev_geom_read_pool_label(const char *name, nvlist_t ***configs,
+    uint64_t *count);
+
 #endif
diff --git a/include/os/freebsd/zfs/sys/zfs_vfsops.h b/include/os/freebsd/zfs/sys/zfs_vfsops.h
index 26652004b..70ada204a 100644
--- a/include/os/freebsd/zfs/sys/zfs_vfsops.h
+++ b/include/os/freebsd/zfs/sys/zfs_vfsops.h
@@ -153,6 +153,9 @@ typedef struct zfid_long {
 extern uint_t zfs_fsyncer_key;
 extern int zfs_super_owner;
 
+extern void zfs_init(void);
+extern void zfs_fini(void);
+
 extern int zfs_suspend_fs(zfsvfs_t *zfsvfs);
 extern int zfs_resume_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds);
 extern int zfs_end_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds);
diff --git a/include/os/linux/spl/sys/trace.h b/include/os/linux/spl/sys/trace.h
index 55c587358..b148ace6a 100644
--- a/include/os/linux/spl/sys/trace.h
+++ b/include/os/linux/spl/sys/trace.h
@@ -104,27 +104,45 @@
 	trace_zfs_##name((uintptr_t)(arg1), (uintptr_t)(arg2), \
 	(uintptr_t)(arg3), (uintptr_t)(arg4))
 
+#define	PROTO_DTRACE_PROBE(name)				\
+	noinline void trace_zfs_##name(void)
+#define	PROTO_DTRACE_PROBE1(name)				\
+	noinline void trace_zfs_##name(uintptr_t)
+#define	PROTO_DTRACE_PROBE2(name)				\
+	noinline void trace_zfs_##name(uintptr_t, uintptr_t)
+#define	PROTO_DTRACE_PROBE3(name)				\
+	noinline void trace_zfs_##name(uintptr_t, uintptr_t,	\
+	uintptr_t)
+#define	PROTO_DTRACE_PROBE4(name)				\
+	noinline void trace_zfs_##name(uintptr_t, uintptr_t,	\
+	uintptr_t, uintptr_t)
+
 #if defined(CREATE_TRACE_POINTS)
 
 #define	FUNC_DTRACE_PROBE(name)					\
+PROTO_DTRACE_PROBE(name);					\
 noinline void trace_zfs_##name(void) { }			\
 EXPORT_SYMBOL(trace_zfs_##name)
 
 #define	FUNC_DTRACE_PROBE1(name)				\
+PROTO_DTRACE_PROBE1(name);					\
 noinline void trace_zfs_##name(uintptr_t arg1) { }		\
 EXPORT_SYMBOL(trace_zfs_##name)
 
 #define	FUNC_DTRACE_PROBE2(name)				\
+PROTO_DTRACE_PROBE2(name);					\
 noinline void trace_zfs_##name(uintptr_t arg1,			\
     uintptr_t arg2) { }						\
 EXPORT_SYMBOL(trace_zfs_##name)
 
 #define	FUNC_DTRACE_PROBE3(name)				\
+PROTO_DTRACE_PROBE3(name);					\
 noinline void trace_zfs_##name(uintptr_t arg1,			\
     uintptr_t arg2, uintptr_t arg3) { }				\
 EXPORT_SYMBOL(trace_zfs_##name)
 
 #define	FUNC_DTRACE_PROBE4(name)				\
+PROTO_DTRACE_PROBE4(name);					\
 noinline void trace_zfs_##name(uintptr_t arg1,			\
     uintptr_t arg2, uintptr_t arg3, uintptr_t arg4) { }		\
 EXPORT_SYMBOL(trace_zfs_##name)
@@ -146,19 +164,6 @@ EXPORT_SYMBOL(trace_zfs_##name)
 
 #else /* CREATE_TRACE_POINTS */
 
-#define	PROTO_DTRACE_PROBE(name)				\
-	noinline void trace_zfs_##name(void)
-#define	PROTO_DTRACE_PROBE1(name)				\
-	noinline void trace_zfs_##name(uintptr_t)
-#define	PROTO_DTRACE_PROBE2(name)				\
-	noinline void trace_zfs_##name(uintptr_t, uintptr_t)
-#define	PROTO_DTRACE_PROBE3(name)				\
-	noinline void trace_zfs_##name(uintptr_t, uintptr_t,	\
-	uintptr_t)
-#define	PROTO_DTRACE_PROBE4(name)				\
-	noinline void trace_zfs_##name(uintptr_t, uintptr_t,	\
-	uintptr_t, uintptr_t)
-
 #define	DEFINE_DTRACE_PROBE(name)	PROTO_DTRACE_PROBE(name)
 #define	DEFINE_DTRACE_PROBE1(name)	PROTO_DTRACE_PROBE1(name)
 #define	DEFINE_DTRACE_PROBE2(name)	PROTO_DTRACE_PROBE2(name)
diff --git a/include/os/linux/zfs/sys/zfs_vfsops.h b/include/os/linux/zfs/sys/zfs_vfsops.h
index 4e60a081a..24a0a2e6a 100644
--- a/include/os/linux/zfs/sys/zfs_vfsops.h
+++ b/include/os/linux/zfs/sys/zfs_vfsops.h
@@ -195,6 +195,9 @@ typedef struct zfid_long {
 #define	SHORT_FID_LEN	(sizeof (zfid_short_t) - sizeof (uint16_t))
 #define	LONG_FID_LEN	(sizeof (zfid_long_t) - sizeof (uint16_t))
 
+extern void zfs_init(void);
+extern void zfs_fini(void);
+
 extern int zfs_suspend_fs(zfsvfs_t *zfsvfs);
 extern int zfs_resume_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds);
 extern int zfs_end_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds);