From 36c1a8eeafc21e2d2fb9df249e4773bddd55fe5b Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 31 Jan 2022 13:22:15 +0100 Subject: [PATCH] linux: Rename __nvme_get_log_page() The prefix of __nvme_get_log_page() is confusing as it usually indicates this is a private function. Rename this function to nvme_get_log_page(). The already existing one nvme_get_log_page() is renamed to nvme_get_log_page_padded() which is asking for 4k transfers. Signed-off-by: Daniel Wagner --- src/libnvme.map | 2 +- src/nvme/fabrics.c | 4 ++-- src/nvme/linux.c | 17 +++++++++-------- src/nvme/linux.h | 14 +++++++------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/libnvme.map b/src/libnvme.map index 009d44cd..eac46108 100644 --- a/src/libnvme.map +++ b/src/libnvme.map @@ -1,6 +1,5 @@ LIBNVME_1_0 { global: - __nvme_get_log_page; __nvme_msg; nvme_admin_passthru64; nvme_admin_passthru; @@ -125,6 +124,7 @@ LIBNVME_1_0 { nvme_get_log_fw_slot; nvme_get_log_lba_status; nvme_get_log_page; + nvme_get_log_page_padded; nvme_get_log_persistent_event; nvme_get_log_predictable_lat_event; nvme_get_log_predictable_lat_nvmset; diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c index 945bac60..c9f987a0 100644 --- a/src/nvme/fabrics.c +++ b/src/nvme/fabrics.c @@ -667,8 +667,8 @@ nvme_ctrl_t nvmf_connect_disc_entry(nvme_host_t h, static int nvme_discovery_log(int fd, __u32 len, struct nvmf_discovery_log *log, bool rae) { - return __nvme_get_log_page(fd, 0, NVME_LOG_LID_DISCOVER, rae, 512, - len, log); + return nvme_get_log_page(fd, 0, NVME_LOG_LID_DISCOVER, rae, 512, + len, log); } int nvmf_get_discovery_log(nvme_ctrl_t c, struct nvmf_discovery_log **logp, diff --git a/src/nvme/linux.c b/src/nvme/linux.c index cc7a3589..499ff85a 100644 --- a/src/nvme/linux.c +++ b/src/nvme/linux.c @@ -116,8 +116,8 @@ int nvme_fw_download_seq(int fd, __u32 size, __u32 xfer, __u32 offset, return err; } -int __nvme_get_log_page(int fd, __u32 nsid, __u8 log_id, bool rae, - __u32 xfer_len, __u32 data_len, void *data) +int nvme_get_log_page(int fd, __u32 nsid, __u8 log_id, bool rae, + __u32 xfer_len, __u32 data_len, void *data) { __u64 offset = 0, xfer; bool retain = true; @@ -169,10 +169,10 @@ int __nvme_get_log_page(int fd, __u32 nsid, __u8 log_id, bool rae, return 0; } -int nvme_get_log_page(int fd, __u32 nsid, __u8 log_id, bool rae, - __u32 data_len, void *data) +int nvme_get_log_page_padded(int fd, __u32 nsid, __u8 log_id, bool rae, + __u32 data_len, void *data) { - return __nvme_get_log_page(fd, nsid, log_id, rae, 4096, data_len, data); + return nvme_get_log_page(fd, nsid, log_id, rae, 4096, data_len, data); } static int nvme_get_telemetry_log(int fd, bool create, bool ctrl, bool rae, @@ -222,7 +222,8 @@ static int nvme_get_telemetry_log(int fd, bool create, bool ctrl, bool rae, } log = tmp; - err = nvme_get_log_page(fd, NVME_NSID_NONE, lid, rae, size, (void *)log); + err = nvme_get_log_page_padded(fd, NVME_NSID_NONE, lid, rae, size, + (void *)log); if (!err) { *buf = log; return 0; @@ -274,8 +275,8 @@ int nvme_get_lba_status_log(int fd, bool rae, struct nvme_lba_status_log **log) buf = tmp; *log = buf; - err = nvme_get_log_page(fd, NVME_NSID_NONE, NVME_LOG_LID_LBA_STATUS, - rae, size, buf); + err = nvme_get_log_page_padded(fd, NVME_NSID_NONE, NVME_LOG_LID_LBA_STATUS, + rae, size, buf); if (!err) return 0; diff --git a/src/nvme/linux.h b/src/nvme/linux.h index d609a140..73b542d3 100644 --- a/src/nvme/linux.h +++ b/src/nvme/linux.h @@ -68,7 +68,7 @@ int nvme_get_host_telemetry(int fd, struct nvme_telemetry_log **log); int nvme_get_new_host_telemetry(int fd, struct nvme_telemetry_log **log); /** - * __nvme_get_log_page() - + * nvme_get_log_page() - * @fd: File descriptor of nvme device * @nsid: Namespace Identifier, if applicable. * @log_id: Log Identifier, see &enum nvme_cmd_get_log_lid. @@ -80,11 +80,11 @@ int nvme_get_new_host_telemetry(int fd, struct nvme_telemetry_log **log); * Return: The nvme command status if a response was received (see * &enum nvme_status_field) or -1 with errno set otherwise. */ -int __nvme_get_log_page(int fd, __u32 nsid, __u8 log_id, bool rae, - __u32 xfer_len, __u32 data_len, void *data); +int nvme_get_log_page(int fd, __u32 nsid, __u8 log_id, bool rae, + __u32 xfer_len, __u32 data_len, void *data); /** - * nvme_get_log_page() - + * nvme_get_log_page_padded() - * @fd: File descriptor of nvme device * @nsid: Namespace Identifier, if applicable. * @log_id: Log Identifier, see &enum nvme_cmd_get_log_lid. @@ -92,14 +92,14 @@ int __nvme_get_log_page(int fd, __u32 nsid, __u8 log_id, bool rae, * @data_len: Total length of the log to transfer. * @data: User address of at least &data_len to store the log. * - * Calls __nvme_get_log_page() with a default 4k transfer length, as that is + * Calls nvme_get_log_page() with a default 4k transfer length, as that is * guarnateed by the protocol to be a safe transfer size. * * Return: The nvme command status if a response was received (see * &enum nvme_status_field) or -1 with errno set otherwise. */ -int nvme_get_log_page(int fd, __u32 nsid, __u8 log_id, bool rae, - __u32 data_len, void *data); +int nvme_get_log_page_padded(int fd, __u32 nsid, __u8 log_id, bool rae, + __u32 data_len, void *data); /** * nvme_get_ana_log_len() - Retreive size of the current ANA log -- 2.50.1