Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

FreeBSD: fix compilation of FreeBSD world after 29274c9f6 

prng32_bounded() is available to kernel only on FreeBSD 13+.

Call inline random_get_pseudo_bytes() with correct pointer type.
To be consistent, apply to Linux as well.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Martin Matuska <mm@FreeBSD.org>
Closes #12282
This commit is contained in:
Martin Matuška 2021-06-25 19:28:51 +02:00 committed by Tony Hutter
parent af9aa4a216
commit b7ecb4ff0d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/os/freebsd/spl/sys/random.h
View File

@ -51,7 +51,7 @@ random_get_pseudo_bytes(uint8_t *p, size_t s)
static inline uint32_t static inline uint32_t
random_in_range(uint32_t range) random_in_range(uint32_t range)
{ {
#if __FreeBSD_version >= 1300108 #if defined(_KERNEL) && __FreeBSD_version >= 1300108
return (prng32_bounded(range)); return (prng32_bounded(range));
#else #else
uint32_t r; uint32_t r;
@ -61,7 +61,7 @@ random_in_range(uint32_t range)
if (range == 1) if (range == 1)
return (0); return (0);
(void) random_get_pseudo_bytes((void *)&r, sizeof (r)); (void) random_get_pseudo_bytes((uint8_t *)&r, sizeof (r));
return (r % range); return (r % range);
#endif #endif

2
include/os/linux/spl/sys/random.h
View File

@ -46,7 +46,7 @@ random_in_range(uint32_t range)
if (range == 1) if (range == 1)
return (0); return (0);
(void) random_get_pseudo_bytes((void *)&r, sizeof (r)); (void) random_get_pseudo_bytes((uint8_t *)&r, sizeof (r));
return (r % range); return (r % range);
} }

2
include/sys/zfs_context.h
View File

@ -650,7 +650,7 @@ random_in_range(uint32_t range)
if (range == 1) if (range == 1)
return (0); return (0);
(void) random_get_pseudo_bytes((void *)&r, sizeof (r)); (void) random_get_pseudo_bytes((uint8_t *)&r, sizeof (r));
return (r % range); return (r % range);
} }