From nobody Thu Feb 24 23:11:41 2022 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 B885519E685A; Thu, 24 Feb 2022 23:11:41 +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 4K4TDs4Przz51cy; Thu, 24 Feb 2022 23:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645744301; 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=j1T5uY7/cQnKhqKTtgn9/tU01I45MhKDjODJDuQN2tQ=; b=eV2BrCN2RT5U8nTHg9o46CcybU8kBIPl9XLWkARZF2C/TOHh4zCizlE7nzuTokzYJ9HqF1 lw1E2oiZWJ9JlsM1b+lPoNmSBjdOcdcxaUbw9HsOgJRs5TpG8cQ+geBv5WgYqvpaflTm0q pgR4FmR3HQuy+HJVm8VEyW0NE5o3TZ1ThYGgJSqTyydKbicD+KpzMBtPAsgi+zombaimzh PPnJcXPxrfNYDiF47q5f2trdkDBipg7RdV3TMdK0tdzpHdWLc8ztmRiI4yPfPJopDy/C6h 0mh+k+HNnU+aRA8O8OWvU18nYEstv3660r11neCh+lFXkfn8CS4KwIwgn1UgtQ== 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 77F3314F11; Thu, 24 Feb 2022 23:11:41 +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 21ONBfp3061492; Thu, 24 Feb 2022 23:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21ONBfsT061491; Thu, 24 Feb 2022 23:11:41 GMT (envelope-from git) Date: Thu, 24 Feb 2022 23:11:41 GMT Message-Id: <202202242311.21ONBfsT061491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 05c3e8e87142 - main - Fix 32-bit build after 530d274c15e5. 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05c3e8e87142a8689503a6731237b48fb43c1bec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645744301; 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=j1T5uY7/cQnKhqKTtgn9/tU01I45MhKDjODJDuQN2tQ=; b=Ccu/2HWDRByyKTrZeU7XMnE/xS0z4kPSgXNwzOMVoW3Uf3NesBz3lqr6W8rJ0b2Y4zgCf4 0WpQRADIe8ui9j8sBQUPNee2HSGsht1tT66V3tVHIsiUBdXeOzOyWj48RKi6+uLZ2PF5le FqjM+kl3th1/0vjKFaKjsDpAPatFMh+wZ3CHJJEw4w8sg7Sq1JANIenJhE5mcf9ouhkMmM APi/VhUALybmtdMgEWDqEl/xETEq2v7gVGXvfTSOK4deHCRVfmU8ksgz6kdsd+0zLuOagK Z5ZkiyS3p/r/DiaRVVZwBMeL1m/iJNYRHqnKKBAR8rtWMvKkI64Gflz67gZudA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645744301; a=rsa-sha256; cv=none; b=qlAJwOkrH6wDB5b9O5SKpVyagrHap10xd2K9/JS3/B4pHblMYkjZf3qxPIRoGxm2PERZtD T1mo5x3UbJZWuO4X6ZpoQJI8BFwa8M0LALgpxkzTsG3vW+K2EDvO7vNAxKev980hzbOpl5 7AcsTiv0c8YSEJA0LuwyHgiNPIz/liL/vqGizKsS0Q0E3LcHV0fO9SMxYj7f7ZARxE/T3v ZKaKvQ8+tV8ek2dzXxc9EtSYxTFooB09iAj6DcgSz643vXFm/foulZI6EHIP68r6ZD2J+z 6QyzOhfkSOfnTvlta+wiZCAoLHqGxS8hFGonwB8cNtmqbAPZjKRGuLEGgl+YhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=05c3e8e87142a8689503a6731237b48fb43c1bec commit 05c3e8e87142a8689503a6731237b48fb43c1bec Author: Alexander Motin AuthorDate: 2022-02-24 23:10:47 +0000 Commit: Alexander Motin CommitDate: 2022-02-24 23:11:36 +0000 Fix 32-bit build after 530d274c15e5. MFC after: 3 days --- sys/cam/ctl/ctl.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index a772c0fd92e1..d6859716bcaa 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -1104,8 +1104,8 @@ ctl_isc_ua(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) uint32_t iid; if (len < sizeof(msg->ua)) { - printf("%s: Received truncated message %d < %lu\n", - __func__, len, sizeof(msg->ua)); + printf("%s: Received truncated message %d < %d\n", + __func__, len, (int)sizeof(msg->ua)); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1145,15 +1145,15 @@ ctl_isc_lun_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) uint32_t targ_lun; if (len < offsetof(struct ctl_ha_msg_lun, data[0])) { - printf("%s: Received truncated message %d < %lu\n", - __func__, len, offsetof(struct ctl_ha_msg_lun, data[0])); + printf("%s: Received truncated message %d < %d\n", + __func__, len, (int)offsetof(struct ctl_ha_msg_lun, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } i = msg->lun.lun_devid_len + msg->lun.pr_key_count * sizeof(pr_key); if (len < offsetof(struct ctl_ha_msg_lun, data[i])) { - printf("%s: Received truncated message data %d < %lu\n", - __func__, len, offsetof(struct ctl_ha_msg_lun, data[i])); + printf("%s: Received truncated message data %d < %d\n", + __func__, len, (int)offsetof(struct ctl_ha_msg_lun, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1229,8 +1229,8 @@ ctl_isc_port_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) int i, new; if (len < offsetof(struct ctl_ha_msg_port, data[0])) { - printf("%s: Received truncated message %d < %lu\n", - __func__, len, offsetof(struct ctl_ha_msg_port, data[0])); + printf("%s: Received truncated message %d < %d\n", + __func__, len, (int)offsetof(struct ctl_ha_msg_port, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1238,8 +1238,8 @@ ctl_isc_port_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) msg->port.port_devid_len + msg->port.target_devid_len + msg->port.init_devid_len; if (len < offsetof(struct ctl_ha_msg_port, data[i])) { - printf("%s: Received truncated message data %d < %lu\n", - __func__, len, offsetof(struct ctl_ha_msg_port, data[i])); + printf("%s: Received truncated message data %d < %d\n", + __func__, len, (int)offsetof(struct ctl_ha_msg_port, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1358,15 +1358,15 @@ ctl_isc_iid_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) int i, iid; if (len < offsetof(struct ctl_ha_msg_iid, data[0])) { - printf("%s: Received truncated message %d < %lu\n", - __func__, len, offsetof(struct ctl_ha_msg_iid, data[0])); + printf("%s: Received truncated message %d < %d\n", + __func__, len, (int)offsetof(struct ctl_ha_msg_iid, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } i = msg->iid.name_len; if (len < offsetof(struct ctl_ha_msg_iid, data[i])) { - printf("%s: Received truncated message data %d < %lu\n", - __func__, len, offsetof(struct ctl_ha_msg_iid, data[i])); + printf("%s: Received truncated message data %d < %d\n", + __func__, len, (int)offsetof(struct ctl_ha_msg_iid, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1396,8 +1396,8 @@ ctl_isc_login(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) { if (len < sizeof(msg->login)) { - printf("%s: Received truncated message %d < %lu\n", - __func__, len, sizeof(msg->login)); + printf("%s: Received truncated message %d < %d\n", + __func__, len, (int)sizeof(msg->login)); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1436,15 +1436,15 @@ ctl_isc_mode_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) uint32_t initidx, targ_lun; if (len < offsetof(struct ctl_ha_msg_mode, data[0])) { - printf("%s: Received truncated message %d < %lu\n", - __func__, len, offsetof(struct ctl_ha_msg_mode, data[0])); + printf("%s: Received truncated message %d < %d\n", + __func__, len, (int)offsetof(struct ctl_ha_msg_mode, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } i = msg->mode.page_len; if (len < offsetof(struct ctl_ha_msg_mode, data[i])) { - printf("%s: Received truncated message data %d < %lu\n", - __func__, len, offsetof(struct ctl_ha_msg_mode, data[i])); + printf("%s: Received truncated message data %d < %d\n", + __func__, len, (int)offsetof(struct ctl_ha_msg_mode, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; }