Skip to content

Commit 96b5f6a

Browse files
committed
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]>
1 parent c22d222 commit 96b5f6a

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

nvme.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7237,7 +7237,7 @@ static int write_zeroes(int argc, char **argv, struct command *acmd, struct plug
72377237
cfg.ref_tag, cfg.storage_tag);
72387238
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.app_tag,
72397239
cfg.app_tag_mask);
7240-
err = nvme_submit_admin_passthru(hdl, &cmd, &result);
7240+
err = nvme_submit_io_passthru(hdl, &cmd, &result);
72417241
if (err < 0)
72427242
nvme_show_error("write-zeroes: %s", nvme_strerror(-err));
72437243
else if (err != 0)
@@ -7348,7 +7348,7 @@ static int dsm(int argc, char **argv, struct command *acmd, struct plugin *plugi
73487348
nvme_init_dsm_range(dsm, ctx_attrs, nlbs, slbas, nr);
73497349
nvme_init_dsm(&cmd, cfg.namespace_id, nr, cfg.idr, cfg.idw, cfg.ad, dsm,
73507350
sizeof(*dsm) * 256);
7351-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
7351+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
73527352
if (err < 0)
73537353
nvme_show_error("data-set management: %s", nvme_strerror(-err));
73547354
else if (err > 0)
@@ -7561,7 +7561,7 @@ static int copy_cmd(int argc, char **argv, struct command *acmd, struct plugin *
75617561
NVME_NVM_PIF_32B_GUARD, 0, cfg.ilbrt, 0);
75627562
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.lbat,
75637563
cfg.lbatm);
7564-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
7564+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
75657565
if (err < 0)
75667566
nvme_show_error("NVMe Copy: %s", nvme_strerror(-err));
75677567
else if (err != 0)
@@ -7685,7 +7685,7 @@ static int resv_acquire(int argc, char **argv, struct command *acmd, struct plug
76857685

76867686
nvme_init_resv_acquire(&cmd, cfg.namespace_id, cfg.racqa, cfg.iekey,
76877687
false, cfg.rtype, cfg.crkey, cfg.prkey, payload);
7688-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
7688+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
76897689
if (err < 0)
76907690
nvme_show_error("reservation acquire: %s", nvme_strerror(-err));
76917691
else if (err > 0)
@@ -7767,7 +7767,7 @@ static int resv_register(int argc, char **argv, struct command *acmd, struct plu
77677767
nvme_init_resv_register(&cmd, cfg.namespace_id, cfg.rrega, cfg.iekey,
77687768
false, cfg.cptpl, cfg.crkey, cfg.nrkey,
77697769
payload);
7770-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
7770+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
77717771
if (err < 0)
77727772
nvme_show_error("reservation register: %s", nvme_strerror(-err));
77737773
else if (err > 0)
@@ -8301,7 +8301,7 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
83018301
cfg.ref_tag, cfg.storage_tag);
83028302
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.app_tag,
83038303
cfg.app_tag_mask);
8304-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
8304+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
83058305
gettimeofday(&end_time, NULL);
83068306
if (cfg.latency)
83078307
printf(" latency: %s: %llu us\n",
@@ -8470,7 +8470,7 @@ static int verify_cmd(int argc, char **argv, struct command *acmd, struct plugin
84708470
cfg.ref_tag, cfg.storage_tag);
84718471
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.app_tag,
84728472
cfg.app_tag_mask);
8473-
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
8473+
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
84748474
if (err < 0)
84758475
nvme_show_error("verify: %s", nvme_strerror(-err));
84768476
else if (err != 0)

0 commit comments

Comments
 (0)