git: 7b540b831d07 - stable/13 - cam: Fix type of elm_idx in struct enc_element.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 28 Jan 2022 00:25:01 UTC
The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=7b540b831d07ffdfa573554a97594fd4afc576e5 commit 7b540b831d07ffdfa573554a97594fd4afc576e5 Author: Alexander Motin <mav@FreeBSD.org> AuthorDate: 2022-01-14 02:38:09 +0000 Commit: Alexander Motin <mav@FreeBSD.org> 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 <sys/sysctl.h> 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 {