Skip to content

Commit b52a6a0

Browse files
committed
nvme: rename nvme_config to nvme_args
Use the same naming scheme as in fabrics, where the common command line argumnent struct is called nvmf_args. Signed-off-by: Daniel Wagner <[email protected]>
1 parent ab19ac7 commit b52a6a0

13 files changed

Lines changed: 130 additions & 130 deletions

logging.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static struct submit_data sb;
3030
bool is_printable_at_level(int level)
3131
{
3232
return ((log_level >= level) &&
33-
(strcmp(nvme_cfg.output_format, "normal") == 0));
33+
(strcmp(nvme_args.output_format, "normal") == 0));
3434
}
3535

3636
int map_log_level(int verbose, bool quiet)
@@ -132,7 +132,7 @@ void nvme_submit_exit(struct nvme_transport_handle *hdl,
132132
bool nvme_decide_retry(struct nvme_transport_handle *hdl,
133133
struct nvme_passthru_cmd *cmd, int err)
134134
{
135-
if (!nvme_cfg.no_retries)
135+
if (!nvme_args.no_retries)
136136
return false;
137137

138138
if (err != -EAGAIN ||

nvme-print-json.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static void json_id_iocs_iocsc(struct json_object *obj_iocsc, __u64 iocsc)
202202

203203
static bool verbose_mode(void)
204204
{
205-
return json_print_ops.flags & VERBOSE || nvme_cfg.output_format_ver == 2;
205+
return json_print_ops.flags & VERBOSE || nvme_args.output_format_ver == 2;
206206
}
207207

208208
static void json_id_iocs(struct nvme_id_iocs *iocs)
@@ -4893,7 +4893,7 @@ static void json_list_item(nvme_ns_t n, struct table *t)
48934893
static void json_print_list_items(struct nvme_global_ctx *ctx)
48944894
{
48954895
if (json_print_ops.flags & VERBOSE) {
4896-
if (nvme_cfg.output_format_ver == 2)
4896+
if (nvme_args.output_format_ver == 2)
48974897
json_detail_list_v2(ctx);
48984898
else
48994899
json_detail_list(ctx);

nvme-print.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define nvme_print(name, flags, ...) \
2121
do { \
2222
struct print_ops *ops = nvme_print_ops(flags); \
23-
if (ops && ops->name && !nvme_cfg.dry_run) \
23+
if (ops && ops->name && !nvme_args.dry_run) \
2424
ops->name(__VA_ARGS__); \
2525
} while (false)
2626

0 commit comments

Comments
 (0)