lkml.org 
[lkml]   [2018]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 09/11] UAPI: ndctl: Fix g++-unsupported initialisation in headers
From
Date
The following code in the linux/ndctl header file:

static inline const char *nvdimm_bus_cmd_name(unsigned cmd)
{
static const char * const names[] = {
[ND_CMD_ARS_CAP] = "ars_cap",
[ND_CMD_ARS_START] = "ars_start",
[ND_CMD_ARS_STATUS] = "ars_status",
[ND_CMD_CLEAR_ERROR] = "clear_error",
[ND_CMD_CALL] = "cmd_call",
};

if (cmd < ARRAY_SIZE(names) && names[cmd])
return names[cmd];
return "unknown";
}

is broken in a number of ways:

(1) ARRAY_SIZE() is not generally defined. Fix this by defining a label
in the enum that indicates the number of commands.

(2) g++ does not support "non-trivial" array initialisers fully yet. Fix
this by defining the missing intermediate values.

(3) Every file that calls this function will acquire a copy of names[].

The same goes for nvdimm_cmd_name().

A better way would be to remove these functions and their arrays from the
header entirely.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Dan Williams <dan.j.williams@intel.com>
cc: linux-nvdimm@lists.01.org
---

include/uapi/linux/ndctl.h | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
index 7e27070b9440..9c89159f6a0f 100644
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -117,6 +117,7 @@ enum {
ND_CMD_VENDOR_EFFECT_LOG = 8,
ND_CMD_VENDOR = 9,
ND_CMD_CALL = 10,
+ nr__ND_CMD = 11
};

enum {
@@ -128,22 +129,29 @@ enum {

static inline const char *nvdimm_bus_cmd_name(unsigned cmd)
{
- static const char * const names[] = {
+ static const char * const names[nr__ND_CMD] = {
+ [0] = NULL,
[ND_CMD_ARS_CAP] = "ars_cap",
[ND_CMD_ARS_START] = "ars_start",
[ND_CMD_ARS_STATUS] = "ars_status",
[ND_CMD_CLEAR_ERROR] = "clear_error",
+ [5] = NULL,
+ [6] = NULL,
+ [7] = NULL,
+ [8] = NULL,
+ [9] = NULL,
[ND_CMD_CALL] = "cmd_call",
};

- if (cmd < ARRAY_SIZE(names) && names[cmd])
+ if (cmd < nr__ND_CMD && names[cmd])
return names[cmd];
return "unknown";
}

static inline const char *nvdimm_cmd_name(unsigned cmd)
{
- static const char * const names[] = {
+ static const char * const names[nr__ND_CMD] = {
+ [0] = NULL,
[ND_CMD_SMART] = "smart",
[ND_CMD_SMART_THRESHOLD] = "smart_thresh",
[ND_CMD_DIMM_FLAGS] = "flags",
@@ -156,7 +164,7 @@ static inline const char *nvdimm_cmd_name(unsigned cmd)
[ND_CMD_CALL] = "cmd_call",
};

- if (cmd < ARRAY_SIZE(names) && names[cmd])
+ if (cmd < nr__ND_CMD && names[cmd])
return names[cmd];
return "unknown";
}
\
 
 \ /
  Last update: 2018-09-05 17:56    [W:0.249 / U:0.208 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site