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.willi...@intel.com>
Suggested-by: Dan Williams <dan.j.willi...@intel.com>
Signed-off-by: Vishal Verma <vishal.l.ve...@intel.com>
---
Tested with a F32 mockbuild
ndctl/Makefile.am | 4 +++-
ndctl/lib/private.h | 8 ++++----
ndctl/list.c | 2 +-
ndctl/monitor.c | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ndctl/Makefile.am b/ndctl/Makefile.am
index 264c4ed..49c6c4a 100644
--- a/ndctl/Makefile.am
+++ b/ndctl/Makefile.am
@@ -18,7 +18,9 @@ ndctl_SOURCES = ndctl.c \
check.c \
region.c \
dimm.c \
- ../util/log.c \
+ ../util/log.c \
+ ../util/filter.c \
+ ../util/filter.h \
list.c \
../util/json.c \
../util/json.h \
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
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-le...@lists.01.org
