FreeBSD: fix compilation of FreeBSD world after 29274c9

prng32_bounded() is availabe to kernel only on FreeBSD 13+. Call inline random_get_pseudo_bytes() with correct pointer type. To be consistent, apply to Linux as well. Signed-off-by: Martin Matuska <mm@FreeBSD.org>
openzfs · Jun 25, 2021 · 5c9c353 · 5c9c353
1 parent 88a4833
commit 5c9c353
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/include/os/freebsd/spl/sys/random.h b/include/os/freebsd/spl/sys/random.h
@@ -51,7 +51,7 @@ random_get_pseudo_bytes(uint8_t *p, size_t s)
 static inline uint32_t
 random_in_range(uint32_t range)
 {
-#if  __FreeBSD_version >= 1300108
+#if defined(_KERNEL) && __FreeBSD_version >= 1300108
 	return (prng32_bounded(range));
 #else
 	uint32_t r;
@@ -61,7 +61,7 @@ random_in_range(uint32_t range)
 	if (range == 1)
 		return (0);
 
-	(void) random_get_pseudo_bytes((void *)&r, sizeof (r));
+	(void) random_get_pseudo_bytes((uint8_t *)&r, sizeof (r));
 
 	return (r % range);
 #endif

diff --git a/include/os/linux/spl/sys/random.h b/include/os/linux/spl/sys/random.h
@@ -46,7 +46,7 @@ random_in_range(uint32_t range)
 	if (range == 1)
 		return (0);
 
-	(void) random_get_pseudo_bytes((void *)&r, sizeof (r));
+	(void) random_get_pseudo_bytes((uint8_t *)&r, sizeof (r));
 
 	return (r % range);
 }

diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
@@ -648,7 +648,7 @@ random_in_range(uint32_t range)
 	if (range == 1)
 		return (0);
 
-	(void) random_get_pseudo_bytes((void *)&r, sizeof (r));
+	(void) random_get_pseudo_bytes((uint8_t *)&r, sizeof (r));
 
 	return (r % range);
 }