Skip to content

Commit 5540e8f

Browse files
ikegami-tigaw
authored andcommitted
nvme: fix to call nvme_submit_io_passthru for I/O commands
Since incorrectly used nvme_submit_admin_passthru by the commands. Signed-off-by: Tokunori Ikegami <[email protected]> Signed-off-by: Daniel Wagner <[email protected]>
1 parent 2c531b0 commit 5540e8f

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

nvme.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7263,7 +7263,7 @@ static int write_zeroes(int argc, char **argv, struct command *acmd, struct plug
72637263
cfg.ref_tag, cfg.storage_tag);
72647264
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.app_tag,
72657265
cfg.app_tag_mask);
7266-
err = nvme_submit_admin_passthru(hdl, &cmd, &result);
7266+
err = nvme_submit_io_passthru(hdl, &cmd, &result);
72677267
if (err < 0)
72687268
nvme_show_error("write-zeroes: %s", nvme_strerror(err));
72697269
else if (err != 0)
@@ -7373,7 +7373,7 @@ static int dsm(int argc, char **argv, struct command *acmd, struct plugin *plugi
73737373

73747374
nvme_init_dsm(&cmd, cfg.namespace_id, nr, cfg.idr, cfg.idw, cfg.ad, dsm,
73757375
sizeof(*dsm) * 256);
7376-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
7376+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
73777377
if (err < 0)
73787378
nvme_show_error("data-set management: %s", nvme_strerror(err));
73797379
else if (err != 0)
@@ -7585,7 +7585,7 @@ static int copy_cmd(int argc, char **argv, struct command *acmd, struct plugin *
75857585
NVME_NVM_PIF_32B_GUARD, 0, cfg.ilbrt, 0);
75867586
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.lbat,
75877587
cfg.lbatm);
7588-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
7588+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
75897589
if (err < 0)
75907590
nvme_show_error("NVMe Copy: %s", nvme_strerror(err));
75917591
else if (err != 0)
@@ -7709,7 +7709,7 @@ static int resv_acquire(int argc, char **argv, struct command *acmd, struct plug
77097709

77107710
nvme_init_resv_acquire(&cmd, cfg.namespace_id, cfg.racqa, cfg.iekey,
77117711
false, cfg.rtype, cfg.crkey, cfg.prkey, payload);
7712-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
7712+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
77137713
if (err < 0)
77147714
nvme_show_error("reservation acquire: %s", nvme_strerror(err));
77157715
else if (err > 0)
@@ -7791,7 +7791,7 @@ static int resv_register(int argc, char **argv, struct command *acmd, struct plu
77917791
nvme_init_resv_register(&cmd, cfg.namespace_id, cfg.rrega, cfg.iekey,
77927792
false, cfg.cptpl, cfg.crkey, cfg.nrkey,
77937793
payload);
7794-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
7794+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
77957795
if (err < 0)
77967796
nvme_show_error("reservation register: %s", nvme_strerror(err));
77977797
else if (err > 0)
@@ -8313,8 +8313,9 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
83138313
cfg.ref_tag, cfg.storage_tag);
83148314
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.app_tag,
83158315
cfg.app_tag_mask);
8316+
83168317
gettimeofday(&start_time, NULL);
8317-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
8318+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
83188319
gettimeofday(&end_time, NULL);
83198320
if (cfg.latency)
83208321
printf(" latency: %s: %llu us\n", command, elapsed_utime(start_time, end_time));
@@ -8480,7 +8481,7 @@ static int verify_cmd(int argc, char **argv, struct command *acmd, struct plugin
84808481
cfg.ref_tag, cfg.storage_tag);
84818482
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.app_tag,
84828483
cfg.app_tag_mask);
8483-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
8484+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
84848485
if (err < 0)
84858486
nvme_show_error("verify: %s", nvme_strerror(err));
84868487
else if (err != 0)

0 commit comments

Comments
 (0)