svn commit: r287676 - stable/10/sys/dev/nvme

[Jim Harris]

Author: jimharris
Date: Fri Sep 11 16:59:04 2015
New Revision: 287676
URL: https://svnweb.freebsd.org/changeset/base/287676

Log:
  MFC r286043:
  
    nvme: do not notify a consumer about failures that occur during initialization
  
  Sponsored by:	Intel

Modified:
  stable/10/sys/dev/nvme/nvme.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/nvme/nvme.c
==============================================================================
--- stable/10/sys/dev/nvme/nvme.c	Fri Sep 11 16:52:13 2015	(r287675)
+++ stable/10/sys/dev/nvme/nvme.c	Fri Sep 11 16:59:04 2015	(r287676)
@@ -390,6 +390,15 @@ nvme_notify_fail_consumers(struct nvme_c
 	struct nvme_consumer	*cons;
 	uint32_t		i;
 
+	/*
+	 * This controller failed during initialization (i.e. IDENTIFY
+	 *  command failed or timed out).  Do not notify any nvme
+	 *  consumers of the failure here, since the consumer does not
+	 *  even know about the controller yet.
+	 */
+	if (!ctrlr->is_initialized)
+		return;
+
 	for (i = 0; i < NVME_MAX_CONSUMERS; i++) {
 		cons = &nvme_consumer[i];
 		if (cons->id != INVALID_CONSUMER_ID && cons->fail_fn != NULL)