From nobody Thu May 25 14:12:13 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 4QRqkQ0QGZz4V2yV; Thu, 25 May 2023 14:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QRqkP6hY2z4HT2; Thu, 25 May 2023 14:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685023933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnSIBeULwYXfQh5mfVvTd2UfKuDR/UAvvC2dX9psnP8=; b=cJApZMZ0nABuptCKmPCnxqdcMGUEHV9IAqKHbPxQ9MHdbyhVoZiRaCIV05nJH4ZRUBnid6 vgqXHiiu0anDwj2dPBL+8ryutaO3vJhxB7Lj8wIh3geVVN1VRCBYUTRvlBL1EKo9WFUqwK qNg0mZFceLkrCHM32XhZOXi+a6Kbc7QmF3s2P3Vrl713RttXX2dq5CPtbsQuHCLQ6xSGnC VQvKQu00Vl9pSb0MJX6cTfSYPV+4SN80n2fS+EnaxbK4DgKD+q3/Y/73pcFHKZU+b+ePP4 4ogmVPqHO4pMVUdoKmh+KrLa7M2fo7bFKE+9nuMQLTfFc4XSCbyNLzHGLBdl2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685023933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnSIBeULwYXfQh5mfVvTd2UfKuDR/UAvvC2dX9psnP8=; b=W4sRcRfoy8nQm6C4wHEi7wGEvIZ9ro6+mjfGUcWv6BP4vNbBM9HwfbmLoc01S+C8BSM+6c zneK6VyEXeKrtXaO1c+T1PgVPEuPOmPrGFHuTxS8EIV6bIWJTcTHV433K6Gvib0Wt4A2jj grLIemSBMWV65nn5RsRateDbFgbSjO0VMO3gN1M8hKr8V2GB6J0heRWP9jou1/FcMZXbHr hG/OFn8l7zWlMyfAs7go8wwPN8blbxls3CPOKttPxiYFH5n+SO/vad7rkzqpFhqSKPBxA6 krDvhkjdSWgr896U6RXiwN/Ij9mu0j34QRDleT6/bCkZd0Ya6Yurb7vSLbJZHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685023933; a=rsa-sha256; cv=none; b=PlCw3qHkTGD3rhqy1PEVYAU7dWWMjPYZr6Duqy1soljKdzvvp+3KwQzGHp70az06T6sauR mHAHlDkfm3EgHdZA4QGBH6rWf4B7JhPLydbovBCQor26WMNUlC9k3i6saSJfWZA+I3Z1PW 3CSORHoR0JJg/kLEaeoLla3ZYD8t9lOz+AgfHIAJDqBPHLyZqr7hlhSizQC0iNyWxSkt7Z +xjI8/sUP917XSPOdWa2rZFOgXKBqhjbBinhhcUB1wi2MH7tjCttVgn9AtVMQ7B3QQy7g6 Cw9Q3xAH58ai4EG+GcccwHG5KCwJxiTnKHS9jNz+KAo3lUs7UCM86hXtF4vXow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QRqkP5lkHzSZ1; Thu, 25 May 2023 14:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34PECD1M045901; Thu, 25 May 2023 14:12:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34PECDM9045900; Thu, 25 May 2023 14:12:13 GMT (envelope-from git) Date: Thu, 25 May 2023 14:12:13 GMT Message-Id: <202305251412.34PECDM9045900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 48f52d9179d5 - main - zfs: Fix build on 32-bit platforms after most recent import. 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48f52d9179d5920750cef0c5d921db63de4d767d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=48f52d9179d5920750cef0c5d921db63de4d767d commit 48f52d9179d5920750cef0c5d921db63de4d767d Author: John Baldwin AuthorDate: 2023-05-25 14:11:38 +0000 Commit: John Baldwin 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) --- 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 */