From 0b35822caa1b8468e1a0349ccf971b600be3c03e Mon Sep 17 00:00:00 2001

From: Vishal Verma <vishal.l.verma@intel.com>

Date: Thu, 30 Jan 2020 11:51:14 -0700

Subject: [ndctl PATCH v3] ndctl/lib: fix symbol redefinitions reported by

 GCC10

A toolchain update in Fedora 32 caused new compile errors due to

multiple definitions of dimm_ops structures. The declarations in

'private.h' for the various NFIT families are present so that libndctl

can find all the per-family dimm-ops. However they need to be declared

as extern because the actual definitions are in <family>.c.

Additionally, 'param' instances in list.c and monitor.c need to be

marked as static.

Cc: Dan Williams <dan.j.williams@intel.com>

Cc: Eric Sandeen <sandeen@redhat.com>

Suggested-by: Dan Williams <dan.j.williams@intel.com>

Reviewed-by: Dan Williams <dan.j.williams@intel.com>

Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>

---

v3: Remove unrelated changes to Makefile.am from this patch (Eric).

 ndctl/lib/private.h | 8 ++++----

 ndctl/list.c        | 2 +-

 ndctl/monitor.c     | 2 +-

 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ndctl/lib/private.h b/ndctl/lib/private.h

index e445301..16bf8f9 100644

--- a/ndctl/lib/private.h

+++ b/ndctl/lib/private.h

@@ -343,10 +343,10 @@ struct ndctl_dimm_ops {

 	int (*xlat_firmware_status)(struct ndctl_cmd *);

 };

-struct ndctl_dimm_ops * const intel_dimm_ops;

-struct ndctl_dimm_ops * const hpe1_dimm_ops;

-struct ndctl_dimm_ops * const msft_dimm_ops;

-struct ndctl_dimm_ops * const hyperv_dimm_ops;

+extern struct ndctl_dimm_ops * const intel_dimm_ops;

+extern struct ndctl_dimm_ops * const hpe1_dimm_ops;

+extern struct ndctl_dimm_ops * const msft_dimm_ops;

+extern struct ndctl_dimm_ops * const hyperv_dimm_ops;

 static inline struct ndctl_bus *cmd_to_bus(struct ndctl_cmd *cmd)

 {

diff --git a/ndctl/list.c b/ndctl/list.c

index 125a9fe..12d78d8 100644

--- a/ndctl/list.c

+++ b/ndctl/list.c

@@ -59,7 +59,7 @@ static unsigned long listopts_to_flags(void)

 	return flags;

 }

-struct util_filter_params param;

+static struct util_filter_params param;

 static int did_fail;

diff --git a/ndctl/monitor.c b/ndctl/monitor.c

index b8ee27f..1755b87 100644

--- a/ndctl/monitor.c

+++ b/ndctl/monitor.c

@@ -45,7 +45,7 @@ struct monitor_dimm {

 	struct list_node list;

 };

-struct util_filter_params param;

+static struct util_filter_params param;

 static int did_fail;

-- 

2.21.1