svn commit: r330955 - head/sys/dev/nvme

Warner Losh imp at FreeBSD.org
Wed Mar 14 23:28:29 UTC 2018


Author: imp
Date: Wed Mar 14 23:28:28 2018
New Revision: 330955
URL: https://svnweb.freebsd.org/changeset/base/330955

Log:
  Fix error messages in cut and pasted code.
  
  Also, fix an unnecessary deref to get ctrlr.
  
  Noticed by: rpokala@
  Sponsored by: Netflix

Modified:
  head/sys/dev/nvme/nvme_ctrlr.c

Modified: head/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- head/sys/dev/nvme/nvme_ctrlr.c	Wed Mar 14 23:01:18 2018	(r330954)
+++ head/sys/dev/nvme/nvme_ctrlr.c	Wed Mar 14 23:28:28 2018	(r330955)
@@ -519,12 +519,12 @@ nvme_ctrlr_destroy_qpair(struct nvme_controller *ctrlr
 	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
 	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);
 	}
 


More information about the svn-src-all mailing list