nvme-print-json: do not enable verbose mode on default

igaw · igaw · commit b32950ca3f94 · 2026-04-01T09:47:58.000+02:00
The default output format version has been changed to 2. The nighly test break because this enabled the verbose mode for the JSON output. Fixes: b1e8cfa ("nvme: change default output format version to 2") Signed-off-by: Daniel Wagner <wagi@kernel.org>
diff --git a/nvme-print-json.c b/nvme-print-json.c
@@ -203,7 +203,7 @@ static void json_id_iocs_iocsc(struct json_object *obj_iocsc, __u64 iocsc)
 
 static bool verbose_mode(void)
 {
-	return json_print_ops.flags & VERBOSE || nvme_args.output_format_ver == 2;
+	return json_print_ops.flags & VERBOSE;
 }
 
 static void json_id_iocs(struct nvme_id_iocs *iocs)

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ static void json_id_iocs_iocsc(struct json_object *obj_iocsc, __u64 iocsc)`
`203`	`203`
`204`	`204`	`static bool verbose_mode(void)`
`205`	`205`	`{`
`206`		`- return json_print_ops.flags & VERBOSE \|\| nvme_args.output_format_ver == 2;`
	`206`	`+ return json_print_ops.flags & VERBOSE;`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`static void json_id_iocs(struct nvme_id_iocs *iocs)`