Re: git: 48f52d9179d5 - main - zfs: Fix build on 32-bit platforms after most recent import.

On 25 May 2023, at 15:12, John Baldwin <jhb@FreeBSD.org> wrote:
> 
> The branch main has been updated by jhb:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=48f52d9179d5920750cef0c5d921db63de4d767d
> 
> commit 48f52d9179d5920750cef0c5d921db63de4d767d
> Author:     John Baldwin <jhb@FreeBSD.org>
> AuthorDate: 2023-05-25 14:11:38 +0000
> Commit:     John Baldwin <jhb@FreeBSD.org>
> CommitDate: 2023-05-25 14:11:38 +0000
> 
>    zfs: Fix build on 32-bit platforms after most recent import.
> 
>    unsigned long is not a uint64_t on 32-bit platforms.  The zfs.4
>    manpage documents this variable as a uint, and it is only compared
>    with other variables of type int, so uint_t makes more sense than
>    unsigned long.
> 
>    (I also wasn't sure if ULONG would work as a ZFS_MODULE_PARAM type
>    on other OS's)

FYI https://github.com/openzfs/zfs/pull/14894

Jess

> ---
> sys/contrib/openzfs/module/zfs/dsl_scan.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sys/contrib/openzfs/module/zfs/dsl_scan.c b/sys/contrib/openzfs/module/zfs/dsl_scan.c
> index 5e3559b251e3..07a527e332bc 100644
> --- a/sys/contrib/openzfs/module/zfs/dsl_scan.c
> +++ b/sys/contrib/openzfs/module/zfs/dsl_scan.c
> @@ -234,7 +234,7 @@ static int zfs_resilver_disable_defer = B_FALSE;
> static int zfs_free_bpobj_enabled = 1;
> 
> /* Error blocks to be scrubbed in one txg. */
> -unsigned long zfs_scrub_error_blocks_per_txg = 1 << 12;
> +uint_t zfs_scrub_error_blocks_per_txg = 1 << 12;
> 
> /* the order has to match pool_scan_type */
> static scan_cb_t *scan_funcs[POOL_SCAN_FUNCS] = {
> @@ -5242,6 +5242,6 @@ ZFS_MODULE_PARAM(zfs, zfs_, scan_report_txgs, UINT, ZMOD_RW,
> ZFS_MODULE_PARAM(zfs, zfs_, resilver_disable_defer, INT, ZMOD_RW,
> "Process all resilvers immediately");
> 
> -ZFS_MODULE_PARAM(zfs, zfs_, scrub_error_blocks_per_txg, U64, ZMOD_RW,
> +ZFS_MODULE_PARAM(zfs, zfs_, scrub_error_blocks_per_txg, UINT, ZMOD_RW,
> "Error blocks to be scrubbed in one txg");
> /* END CSTYLED */