From nobody Fri Jan 14 02:43:37 2022 X-Original-To: dev-commits-src-all@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 49C94194E3A9; Fri, 14 Jan 2022 02:43:38 +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 4JZlwp1LXhz4VlC; Fri, 14 Jan 2022 02:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642128218; 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=RTYAFoT/J80tj3+2MDM+9uuGStCiVDIbpER+05vXRG0=; b=b+Psnfamrl+FWtXdoV7OzQRe2/UVXpY+atrFeW6um60NgpFKg3ZiX65gD6pzfPgoKP5IZE g95LmyljzPK17Zebm/Y+IIfFepp9imMJ6TgcCQaxpC11v+QlsrauMg6tPvDawRO2ooxD3T 9XKSYT97OwQnlGm4evirMNbnZObplE2T3x9hhm5BrdXx0nNboHyS+S6OpuBCEBC3vaz3vq 8sqdvuCSgkdjdB5OD/kQBRlge51dRHNLI7hQQkWY40xVZZvcOpM7Ws/3a1X6EzkghsM2pB UF7KpGCUwP586XMRXeY6zXGoS9fRWReBXSVgET0uV7SF1Jv+lx8PwJeghz3RSQ== 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 0E18A3C79; Fri, 14 Jan 2022 02:43:38 +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 20E2hbJb056636; Fri, 14 Jan 2022 02:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20E2hbmA056635; Fri, 14 Jan 2022 02:43:37 GMT (envelope-from git) Date: Fri, 14 Jan 2022 02:43:37 GMT Message-Id: <202201140243.20E2hbmA056635@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: dd694648ff0f - main - cam: Fix type of elm_idx in struct enc_element. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: dd694648ff0f1c33ea05d9eb63fdbec527b27836 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642128218; 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=RTYAFoT/J80tj3+2MDM+9uuGStCiVDIbpER+05vXRG0=; b=nCbP3qFTzQZol1keF2/xWR0MtNILxKKrHBaaBCuXbAC3uubM0BUiXC8by53r4d+Gjssnni 7NLD49iZrGXD9gkCAhGVBzATabLuM7QYoywUoca//hKT4XZlHblFItW31LOUhshaQf7jSL E6ShyC7amFIVC/tG9ej5/clN+yBDLLiD/rHEK7Mx1UA6x0ovDqxdc9Ab8WSHg00OHCh/f2 C2QOOqnf/fe2J8J4yqoXUl4q/0FLaICJj3hGr5PhJZZ8SxzbV8Qp5My1+2JElqFbSpQ14h e7ZD4TMPtVEz7ggvCMVmniO1M/J/3fLeE3Ytbn+eTpMCcynHE5N7hyWPL2VrvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642128218; a=rsa-sha256; cv=none; b=ir3yO63dcZKeeDweUaPIupB3dAXdtcz7Bs8vFhCHkWqjv16SQov1Af4x6p9wbTisHRfWwJ +sRW3mz3zqUW0V6hkn/qgMpJN+pQ4qf1iGMfwjKapWaMJjmbHcvK//A4DOrtynEexUmviG yhV7xP+WWlhqKjMkmZfjSJ3q2cDEMK4auDx8ry5+D6liIxOp4qnLiekmYL+K7eHwvUFHFF NGIpjIc5lZeYURnJH2eMyoe2Eds+jtFE3JyyVacIC5hPGzSfeRgeo4Cl3mJZ5z8fY6Wfc6 dkxk2b3SDsiKNsgDi+1MzUZaqPDtQMFhPj6HkWQoI465Gp8LjXUyu3Q4DilCnA== 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=dd694648ff0f1c33ea05d9eb63fdbec527b27836 commit dd694648ff0f1c33ea05d9eb63fdbec527b27836 Author: Alexander Motin AuthorDate: 2022-01-14 02:38:09 +0000 Commit: Alexander Motin CommitDate: 2022-01-14 02:43:34 +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 --- 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 61696a89b4ee..cea5eebfeb5f 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 {