From 5d7fd8f726711cf7f1b4a0e2bbd1de283f9564b3 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 14 Mar 2018 23:28:28 +0000 Subject: [PATCH] Fix error messages in cut and pasted code. Also, fix an unnecessary deref to get ctrlr. Noticed by: rpokala@ Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index c916c7a933a8..f2a687953dc1 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -519,12 +519,12 @@ nvme_ctrlr_destroy_qpair(struct nvme_controller *ctrlr, struct nvme_qpair *qpair struct nvme_completion_poll_status status; status.done = 0; - nvme_ctrlr_cmd_delete_io_sq(qpair->ctrlr, qpair, + nvme_ctrlr_cmd_delete_io_sq(ctrlr, qpair, nvme_completion_poll_cb, &status); while (!atomic_load_acq_int(&status.done)) pause("nvme", 1); if (nvme_completion_is_error(&status.cpl)) { - nvme_printf(ctrlr, "nvme_create_io_sq failed!\n"); + nvme_printf(ctrlr, "nvme_destroy_io_sq failed!\n"); return (ENXIO); } @@ -534,7 +534,7 @@ nvme_ctrlr_destroy_qpair(struct nvme_controller *ctrlr, struct nvme_qpair *qpair while (!atomic_load_acq_int(&status.done)) pause("nvme", 1); if (nvme_completion_is_error(&status.cpl)) { - nvme_printf(ctrlr, "nvme_create_io_cq failed!\n"); + nvme_printf(ctrlr, "nvme_destroy_io_cq failed!\n"); return (ENXIO); }