From nobody Fri Jan 28 00:25:22 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 69339197EA28; Fri, 28 Jan 2022 00:25:22 +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 4JlJBp29Kyz595Z; Fri, 28 Jan 2022 00:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643329522; 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=DcQKe/V2QvZLgzWMpunrqnnCVEGuET7nFPwi0an0Wa0=; b=ualH2yPcwiZ+mnKWZ11jr3bPn/kNoeDAyHa5yVymt/OMvVlj7ZMu2tv9ZZhb9TFHQ2O41N 9wv6/qjiruO85cTUhrjFtPRxAhGXUaKd9/rwZWwRGrAda18u9cliOGyZzBgEewxHfqRed8 dpin8qCq1lvgrYuy7xPbMj3NVFhhG6+TfTFFcVyOivJQS4A6kR84HLzLSyPKOyHO5SIXDU I3tDFOSF6c3q6gAS6FjyyKK/VW43aZivmrphv/iCYrI5NTdvc8PrAuZDUKguyHYT+AzBAi SXfnAeufjgJ24Ij14aFs6ealS99P8s96menpBRqTwjB3117HyWgm6YuFhyIlGw== 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 2BDD1208BE; Fri, 28 Jan 2022 00:25:22 +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 20S0PMoM045961; Fri, 28 Jan 2022 00:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20S0PMlA045960; Fri, 28 Jan 2022 00:25:22 GMT (envelope-from git) Date: Fri, 28 Jan 2022 00:25:22 GMT Message-Id: <202201280025.20S0PMlA045960@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: 83f1bf0594a4 - stable/12 - cam: Fix type of elm_idx in struct enc_element. 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/12 X-Git-Reftype: branch X-Git-Commit: 83f1bf0594a448d3e1f6a78a02697bb3746e9d9d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643329522; 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=DcQKe/V2QvZLgzWMpunrqnnCVEGuET7nFPwi0an0Wa0=; b=rRgxTCgbRLpLX4QjN2P3pyUzercSUCeXUsmmmEvvt5wLg1YKoRAkElNLiSwvFArcAVf1Wl Oa/DDJm4J15fgsTZgXJxX3gr/Pj7F6U5M/7OQtBZwp1bKe4d/G6pfnhIq7kFMIr3ZVYRfg DICq9bMcXhEA6MjH3Bh9mvNqobBNj3dVWY1hX9uxot8uCVYoepfz3b4jDl6Q9ifj7ZxTv1 nFC62Si49qik7xJ22JrwoNOxrhICjrE5NPFWlg4iMgSHsP+qFScmSJ7wE9dZWdLlERf3HO YKV/vEVnTzim9QMuGRsRQZnl1mk+ZVYBNs0G0wAxnkuEBwRYfM1tR1g4FAF+SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643329522; a=rsa-sha256; cv=none; b=NZHcrBslaRY3O4X9vC2C9H/ufUtqorBHM//Bfep0iXlNLlpu+Ew2EkoEoE3DazjHJ4J81g MXAXzTAv3i+4rjpYjvbpPOCVPUywZhYf5qR4hBbyPPIJOXH8Y5b2/bgu6KgrZMcC9RXfE5 fnZf/ZW5RBve7E9q4a1UqfQyOCz1Nl+wEW96ar8Qf9uUqkuluentpN5YlwkfINvJvjCzGi eKmzyWHiSRjO8smLPKGhjnnXJfgk/jgxja0stYlsAhh9A12GYsAObdSjd/p2d3NXMjMxmr jrl6Ya/vcB1F41Nx5gxor8kUgTfkwu7Yi4R1WdXoE8Q/b6Ytk0hweRAwrWNvvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=83f1bf0594a448d3e1f6a78a02697bb3746e9d9d commit 83f1bf0594a448d3e1f6a78a02697bb3746e9d9d Author: Alexander Motin AuthorDate: 2022-01-14 02:38:09 +0000 Commit: Alexander Motin CommitDate: 2022-01-28 00:25:18 +0000 cam: Fix type of elm_idx in struct enc_element. It is a global element index, so it may need more than one byte. For now it is only a cosmetics, since the field is never read. MFC after: 2 weeks (cherry picked from commit dd694648ff0f1c33ea05d9eb63fdbec527b27836) --- sys/cam/scsi/scsi_enc_internal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/scsi/scsi_enc_internal.h b/sys/cam/scsi/scsi_enc_internal.h index ed00dee1578c..3d7ee280f4fd 100644 --- a/sys/cam/scsi/scsi_enc_internal.h +++ b/sys/cam/scsi/scsi_enc_internal.h @@ -39,16 +39,16 @@ #include typedef struct enc_element { - uint8_t elm_idx; /* index of element */ + u_int elm_idx; /* index of element */ uint8_t elm_type; /* element type */ uint8_t subenclosure; /* subenclosure id */ uint8_t type_elm_idx; /* index of element within type */ uint8_t svalid; /* enclosure information valid */ - uint16_t priv; /* private data, per object */ uint8_t encstat[4]; /* state && stats */ + u_int physical_path_len; /* Length of device path data. */ uint8_t *physical_path; /* Device physical path data. */ - u_int physical_path_len; /* Length of device path data. */ void *elm_private; /* per-type object data */ + uint16_t priv; } enc_element_t; typedef enum {