From dc3f3471f8a00ce0c8fb4cbf2a31e299696f3bbc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 31 Jan 2023 05:13:00 +0100 Subject: Adding upstream version 2.3. Signed-off-by: Daniel Baumann --- plugins/memblaze/memblaze-utils.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'plugins/memblaze/memblaze-utils.h') diff --git a/plugins/memblaze/memblaze-utils.h b/plugins/memblaze/memblaze-utils.h index 84263f3..f64a115 100644 --- a/plugins/memblaze/memblaze-utils.h +++ b/plugins/memblaze/memblaze-utils.h @@ -9,8 +9,6 @@ #define NM_SIZE 2 #define RAW_SIZE 7 -typedef unsigned char u8; - // Intel Format & new format /* Raisin Additional smart external ID */ #define RAISIN_SI_VD_PROGRAM_FAIL_ID 0xAB @@ -135,18 +133,18 @@ struct nvme_memblaze_smart_log_item { struct nvme_memblaze_smart_log { struct nvme_memblaze_smart_log_item items[NR_SMART_ITEMS]; - u8 resv[SMART_INFO_OLD_SIZE - sizeof(struct nvme_memblaze_smart_log_item) * NR_SMART_ITEMS]; + __u8 resv[SMART_INFO_OLD_SIZE - sizeof(struct nvme_memblaze_smart_log_item) * NR_SMART_ITEMS]; }; // Intel Format & new format struct nvme_p4_smart_log_item { /* Item identifier */ - u8 id[ID_SIZE]; + __u8 id[ID_SIZE]; /* Normalized value or percentage. In the range from 0 to 100. */ - u8 nmVal[NM_SIZE]; + __u8 nmVal[NM_SIZE]; /* raw value */ - u8 rawVal[RAW_SIZE]; + __u8 rawVal[RAW_SIZE]; }; struct nvme_p4_smart_log @@ -158,7 +156,7 @@ struct nvme_p4_smart_log * because micron's getlogpage request,the size of many commands have changed to 4k. * request size > user malloc size,casuing parameters that are closed in momery are dirty. */ - u8 resv[SMART_INFO_NEW_SIZE - sizeof(struct nvme_p4_smart_log_item) * NR_SMART_ITEMS]; + __u8 resv[SMART_INFO_NEW_SIZE - sizeof(struct nvme_p4_smart_log_item) * NR_SMART_ITEMS]; }; // base @@ -221,4 +219,3 @@ struct nvme_p4_smart_log } #endif // __MEMBLAZE_UTILS_H__ - -- cgit v1.2.3