From nobody Fri Jan 28 00:25:01 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 79B6D197E65E; Fri, 28 Jan 2022 00:25:01 +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 4JlJBP31x9z58rX; Fri, 28 Jan 2022 00:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643329501; 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=6tmFjgZN+7wgC1HfN0lMxmJTYy7Xe0sbNGWYJ+xOdf4=; b=tIfVhcmZDxy8duwMt5lKz5y3koIMf8Wjl3X7IMcmY5ZO2l4kG9rKFUTL9cPCcCsDH1Wjos A+OD9hs0AucBjyTad6EDsNXLmA/8YTNnKzN297zWxkyr1ydF9hIBDjOMnfZRFcO/O4YGAU bOeZLF/gNoWcI+4xaHgTOav4FcOr6DHk7V+mBCyiKBsLW5skyF57p56xNMn1Z6Aq/pSYKP RuzjaKdkQLU4sFjWs2f6h2wNCcWKp1+rlcJMBK/5nt9f3iTOekDr6dJotd28Ah8HkrXAEo 5dDt2eoRFSF9nYoO4ysK4lNIM+ZVEI/F8huxNWNKbRFbngwrsTOdWU3lbD6zZQ== 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 489B8207CD; Fri, 28 Jan 2022 00:25:01 +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 20S0P1vW045821; Fri, 28 Jan 2022 00:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20S0P1jV045820; Fri, 28 Jan 2022 00:25:01 GMT (envelope-from git) Date: Fri, 28 Jan 2022 00:25:01 GMT Message-Id: <202201280025.20S0P1jV045820@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: 7b540b831d07 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 7b540b831d07ffdfa573554a97594fd4afc576e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643329501; 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=6tmFjgZN+7wgC1HfN0lMxmJTYy7Xe0sbNGWYJ+xOdf4=; b=l1cw2TSY9/Ig8L+xeynNtGmRULOA0ENZtKISRo6Jn4M3rVeUSf4IPtUJjhEBx2x5A1IZ7V 22NzChLHcnb4+Vi7PcbXG9Yt3QIQNFZRX8RO7Cj91Z4J6gBM1b++pnyrzK8cUa6G5/uD7d +8JoB6LeGC5uJ2IF5CTMu/4uuSiDI2M80nMVrewPpAe8ctBvuXynYRJZuU91dEjFSZca/a ZvdLOH5S8G6giKAnhX1Uw52c8KoFvIUZCmZ67vIDIKdh+/X8cTdwwgftvtujp+MIBXCfFO FM0Cbm0M0blkUFvb15GW+bbEDllOH22TSAYjuvCGHJjmdeMJW6m/Q3tVlwpUSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643329501; a=rsa-sha256; cv=none; b=NJE3TpVWpRx/RKz7B5LNKro/UQvuNNYHsWdu9/lIzVDh/JsUWqTFFaswRgVD4c7Gid1G+N rsRgQhPIgg7IoIZFb6uChkqDwrMItFAHMswqYCewdIIfMooKpANBKGhCo+CdR6VDoxbxtY 5wLTLzk3JX/ZgGMPJyr7Q2j4UI26Q8FGlQ7/pzDgwdqtTnxZpxveUwNNg4vh0vDo4kwzk1 UiPSwj83ZiJc3jFpoGsqxJPLYhhbHTQfygaPx16r4VldEED8xE2SqmA4/uiDbBFamJaLsV aGUCzQRgnifFkOGrxFJgdclRK75xR/m2xSFsYl6yUukZAyGM6EbWb9gQrTd2RQ== 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=7b540b831d07ffdfa573554a97594fd4afc576e5 commit 7b540b831d07ffdfa573554a97594fd4afc576e5 Author: Alexander Motin AuthorDate: 2022-01-14 02:38:09 +0000 Commit: Alexander Motin CommitDate: 2022-01-28 00:24:55 +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 {