summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@kernel.org>2021-06-02 17:18:58 +0900
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2021-06-10 13:38:25 -0400
commitca24306d83a125df187ad53eddb038fe0cffb8ca (patch)
treeded15cb9027a6d138d2cb83ffa26535504c81ef8 /fs/proc
parentee0a07017ae34f2dbf5775956d8fc3f6d36be985 (diff)
downloadlinux-ca24306d83a125df187ad53eddb038fe0cffb8ca.tar.bz2
bootconfig: Change array value to use child node
It is not possible to put an array value with subkeys under a key node, because both of subkeys and the array elements are using "next" field of the xbc_node. Thus this changes the array values to use "child" field in the array case. The reason why split this change is to test it easily. Link: https://lkml.kernel.org/r/162262193838.264090.16044473274501498656.stgit@devnote2 Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/bootconfig.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/bootconfig.c b/fs/proc/bootconfig.c
index ad31ec4ad627..6d8d4bf20837 100644
--- a/fs/proc/bootconfig.c
+++ b/fs/proc/bootconfig.c
@@ -49,7 +49,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)
else
q = '"';
ret = snprintf(dst, rest(dst, end), "%c%s%c%s",
- q, val, q, vnode->next ? ", " : "\n");
+ q, val, q, xbc_node_is_array(vnode) ? ", " : "\n");
if (ret < 0)
goto out;
dst += ret;