Merge pull request #207 from igaw/rename-__nvme_get_log_page

Rename   nvme get log page

Author: dwsuse

src/libnvme.map

@@ -1,7 +1,5 @@
 LIBNVME_1_0 {
 	global:
-		__nvme_get_log_page;
-		__nvme_msg;
 		nvme_admin_passthru64;
 		nvme_admin_passthru;
 		nvme_attach_ns;
@@ -125,6 +123,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;

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,

src/nvme/json.c

@@ -14,6 +14,7 @@
 
 #include "fabrics.h"
 #include "log.h"
+#include "private.h"
 
 #define json_object_add_value_string(o, k, v)			\
 	json_object_object_add(o, k, json_object_new_string(v))

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;
 

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,26 +80,26 @@ 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.
  * @rae:      Retain asynchronous events
  * @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

src/nvme/log.h

@@ -15,22 +15,6 @@
 #  define DEFAULT_LOGLEVEL LOG_NOTICE
 #endif
 
-#if (LOG_FUNCNAME == 1)
-#define __nvme_log_func __func__
-#else
-#define __nvme_log_func NULL
-#endif
-
-void __attribute__((format(printf, 4, 5)))
-__nvme_msg(nvme_root_t r, int lvl, const char *func, const char *format, ...);
-
-#define nvme_msg(r, lvl, format, ...)					\
-	do {								\
-		if ((lvl) <= MAX_LOGLEVEL)				\
-			__nvme_msg(r, lvl, __nvme_log_func,		\
-				   format, ##__VA_ARGS__);		\
-	} while (0)
-
 /**
  * nvme_init_logging() - initialize logging
  * @r: nvme_root_t context

src/nvme/private.h

@@ -133,4 +133,20 @@ void json_read_config(nvme_root_t r, const char *config_file);
 
 int json_update_config(nvme_root_t r, const char *config_file);
 
+#if (LOG_FUNCNAME == 1)
+#define __nvme_log_func __func__
+#else
+#define __nvme_log_func NULL
+#endif
+
+void __attribute__((format(printf, 4, 5)))
+__nvme_msg(nvme_root_t r, int lvl, const char *func, const char *format, ...);
+
+#define nvme_msg(r, lvl, format, ...)					\
+	do {								\
+		if ((lvl) <= MAX_LOGLEVEL)				\
+			__nvme_msg(r, lvl, __nvme_log_func,		\
+				   format, ##__VA_ARGS__);		\
+	} while (0)
+
 #endif /* _LIBNVME_PRIVATE_H */