From nobody Tue Mar 29 01:51:05 2022 X-Original-To: dev-commits-src-branches@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 8919F1A402DA; Tue, 29 Mar 2022 01:51:05 +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 4KSCG12xqsz3MHL; Tue, 29 Mar 2022 01:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648518665; 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=TjcLaUXKoUubkpe2W9aIGFVx8ZML8l5Xe2JHQmSgbto=; b=DiRkoiokYN4+VbleYRmXJRsHLOdaotEzEeYqy0sRaEA/irqiuOsFOk4qGo0Bt5qVV2loKH 8bjzAlOT6DkuveT9ibDht8nTHcJ3RFxTzJzuT10Hbx4NGB/RyIlqiKvFDtduSAamtXgtnB 3LXUrQzwbe5uzQJkG8rwmQHaZ9GmglF/dh7xznjgSc3qhD/nbMdT35hJCP3LY0KatMO9Qt OPTf7UZmcKaILm87TeJPwbZ/mqp+QnNLAaRSMqcx7bQNXFOMp/VT4pwbZ7KnH+jGdQQUxS K6d1pXLLxnwzXylIh+lPI2DIiLCUfqhjsBaHcOkqt2OaonszgEoj+nEgoL6+Mw== 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 446E21567D; Tue, 29 Mar 2022 01:51:05 +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 22T1p5YI031978; Tue, 29 Mar 2022 01:51:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22T1p5sQ031969; Tue, 29 Mar 2022 01:51:05 GMT (envelope-from git) Date: Tue, 29 Mar 2022 01:51:05 GMT Message-Id: <202203290151.22T1p5sQ031969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: b6a744133340 - stable/13 - Fix 32-bit build after 530d274c15e5. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b6a744133340ca419aae71f56bbaaa88219403f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648518665; 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=TjcLaUXKoUubkpe2W9aIGFVx8ZML8l5Xe2JHQmSgbto=; b=oyqs+LpkCie1pheDHaSB7ppRrmePslGYrdl2Tjo7U47KIIyOR12gfvFAmD2EgQ9pls33vb ECNkbhSEj8Ei7dvK0LBcsgJP7tKt/9dQV4/gXqgeaF8HTrUc44flPlbLkFWea3GVmZUhsc RxYvllx12fMIv9ZG2chbcaOnTFvkFhow3JJh4v3MseIsrJFnnPmz+PN3H+mVUmaZuaN6mf BOsrmm6AmrNkmSet+wX+7i6Ztk6ZwDsjDvLSLI2Jn8Nhm2RfaUh79hmHx75Z+f/bBCwLIN 2+l7ISW0hMH6tRjuY0QFiaH0gFOWUoB37Yuqs5Wp+jSPtMEx5rJBucTEcyyEvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648518665; a=rsa-sha256; cv=none; b=TuRZHUUGREQ3TO2jCvz1Qjf6W9NS6xr23LQ3qOYTjQXaUMO5kXWzLHc+AVMpkyXJBujPdE xoNfbAnoI8EImOgm9GlySmW8+XdPdy+/+hToi90EDp+LFgoiZBChDknFcbAkyIFTWRtRjf kwqdaqymwecDST1TpTp/O+aTnzpwVKHyIpRwJZF8WxHrUJjPNtgIT3JM1LClqHCxtFaelH xspf8j4/5RUrE+pMt/UXkld5AqgRfsmLF8dVsgjrsf/Pn/IVPwxpg+WAOdei2TvmTm508b +2ngPyAFdT2bgylXQxA+4f1Tp+V+7vg0wZqO2ZbJTBjsRCedv7KNPEpg6dDjDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b6a744133340ca419aae71f56bbaaa88219403f8 commit b6a744133340ca419aae71f56bbaaa88219403f8 Author: Alexander Motin AuthorDate: 2022-02-24 23:10:47 +0000 Commit: Alexander Motin CommitDate: 2022-03-29 01:30:48 +0000 Fix 32-bit build after 530d274c15e5. MFC after: 3 days (cherry picked from commit 05c3e8e87142a8689503a6731237b48fb43c1bec) --- 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 8bdd4736254f..f1de6917953d 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; }