From: Jeremy Kerr <jk@codeconstruct.com.au>
Date: Tue, 12 Jul 2022 08:54:53 +0000 (+0800)
Subject: plugins/ocp: pass struct nvme_dev to internal functions
X-Git-Tag: v2.2~60
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=12e8bdda7d35d63f29905cdb69376ea380c39fa3;p=users%2Fsagi%2Fnvme-cli.git

plugins/ocp: pass struct nvme_dev to internal functions

Currently, we're passing a NVMe file descriptor, then accessing the
global nvme_dev.

This change just passes the local struct nvme_dev instead.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
---

diff --git a/plugins/ocp/ocp-nvme.c b/plugins/ocp/ocp-nvme.c
index 60a2bdfb..ac8239c3 100644
--- a/plugins/ocp/ocp-nvme.c
+++ b/plugins/ocp/ocp-nvme.c
@@ -429,10 +429,11 @@ static int ocp_smart_add_log(int argc, char **argv, struct command *cmd,
         return ret;
 }
 
-static int ocp_print_C3_log_normal(struct ssd_latency_monitor_log *log_data)
+static int ocp_print_C3_log_normal(struct nvme_dev *dev,
+				   struct ssd_latency_monitor_log *log_data)
 {
         printf("-Latency Monitor/C3 Log Page Data- \n");
-        printf("  Controller   :  %s\n", nvme_dev->name);
+        printf("  Controller   :  %s\n", dev->name);
         int i, j;
         int pos = 0;
         char       ts_buf[128];
@@ -662,7 +663,7 @@ static void ocp_print_C3_log_json(struct ssd_latency_monitor_log *log_data)
         json_free_object(root);
 }
 
-static int get_c3_log_page(int fd, char *format)
+static int get_c3_log_page(struct nvme_dev *dev, char *format)
 {
         int ret = 0;
         int fmt = -1;
@@ -682,7 +683,7 @@ static int get_c3_log_page(int fd, char *format)
         }
         memset(data, 0, sizeof (__u8) * C3_LATENCY_MON_LOG_BUF_LEN);
 
-        ret = nvme_get_log_simple(fd, C3_LATENCY_MON_OPCODE,
+        ret = nvme_get_log_simple(dev->fd, C3_LATENCY_MON_OPCODE,
                         C3_LATENCY_MON_LOG_BUF_LEN, data);
 
         if (strcmp(format, "json"))
@@ -725,7 +726,7 @@ static int get_c3_log_page(int fd, char *format)
 
                 switch (fmt) {
                 case NORMAL:
-                        ocp_print_C3_log_normal(log_data);
+                        ocp_print_C3_log_normal(dev, log_data);
                         break;
                 case JSON:
                         ocp_print_C3_log_json(log_data);
@@ -766,7 +767,7 @@ static int ocp_latency_monitor_log(int argc, char **argv, struct command *comman
         if (ret < 0)
                 return ret;
 
-        ret = get_c3_log_page(dev->fd, cfg.output_format);
+        ret = get_c3_log_page(dev, cfg.output_format);
         if (ret)
                 fprintf(stderr,
                         "ERROR : OCP : Failure reading the C3 Log Page, ret = %d\n",