From nobody Thu May 25 21:03:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QS0rh3w6Vz4CfXX for ; Thu, 25 May 2023 21:03:16 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QS0rh1jCqz4RVV for ; Thu, 25 May 2023 21:03:16 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3078a3f3b5fso2547509f8f.0 for ; Thu, 25 May 2023 14:03:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685048594; x=1687640594; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4m11MoNJm3DnIeQCbxGlotbH0yypEKYB0Ut3gY5TMMQ=; b=EUqtt/GzKCgJd+i1z1ctVak/f4b/t+vpsbAXe4Z4PDS+kiRsCwRF5Dsoe0CamDFXi1 YR+4B7WoEZhqs29Nxcb4YCwaoZd+Gjvbf+IpGE1qNsLDu1mR1sHRcNWpMq3YHkv6ll4d WWD6vPzV2TcZ2mNjaOwr4MYafHKQ7wGnQeBKkL0qyAySdAvxMGAY9VPKbuNZQSy671wB Pvo6zUcLPmOwrkmH9KEq6CiMOQ7/OCZ1CV75F19rw8B6yWJGRbluYXcoTA9Q6QxzgRxf pj+szTPlDcxTZuka1Y6zq94li6lMRVaMi/hKwlqLPse38Q2vBC8kXLxaBSzo9AnFGEfD YN9Q== X-Gm-Message-State: AC+VfDypzhAZlighpgdjErBbbarjuchV9RFO/eKGKltCBk0KyuzdStgq a0gnus1/ysU524CVR8b28JuykA== X-Google-Smtp-Source: ACHHUZ635ohZ6ipbqigGTqdDll3bHE8BW7G4S3cucf2zL6X1Wlfho1cXh8lTJhKubqYEMZBEOBNGbg== X-Received: by 2002:adf:ff8d:0:b0:2dc:cad4:87b9 with SMTP id j13-20020adfff8d000000b002dccad487b9mr3700837wrr.68.1685048593715; Thu, 25 May 2023 14:03:13 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id o4-20020a5d4744000000b003062675d4c9sm2895552wrs.39.2023.05.25.14.03.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 May 2023 14:03:13 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.500.231\)) Subject: Re: git: 48f52d9179d5 - main - zfs: Fix build on 32-bit platforms after most recent import. From: Jessica Clarke In-Reply-To: <202305251412.34PECDM9045900@gitrepo.freebsd.org> Date: Thu, 25 May 2023 22:03:02 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <029A33E2-BB27-4D43-808B-1634E7EA69C0@freebsd.org> References: <202305251412.34PECDM9045900@gitrepo.freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.3731.500.231) X-Rspamd-Queue-Id: 4QS0rh1jCqz4RVV X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 25 May 2023, at 15:12, John Baldwin wrote: >=20 > The branch main has been updated by jhb: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D48f52d9179d5920750cef0c5d921db63= de4d767d >=20 > commit 48f52d9179d5920750cef0c5d921db63de4d767d > Author: John Baldwin > AuthorDate: 2023-05-25 14:11:38 +0000 > Commit: John Baldwin > CommitDate: 2023-05-25 14:11:38 +0000 >=20 > zfs: Fix build on 32-bit platforms after most recent import. >=20 > 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. >=20 > (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(-) >=20 > 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 =3D B_FALSE; > static int zfs_free_bpobj_enabled =3D 1; >=20 > /* Error blocks to be scrubbed in one txg. */ > -unsigned long zfs_scrub_error_blocks_per_txg =3D 1 << 12; > +uint_t zfs_scrub_error_blocks_per_txg =3D 1 << 12; >=20 > /* the order has to match pool_scan_type */ > static scan_cb_t *scan_funcs[POOL_SCAN_FUNCS] =3D { > @@ -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"); >=20 > -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 */