From owner-svn-src-all@FreeBSD.ORG  Mon Mar 17 21:45:08 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 982CD72D;
 Mon, 17 Mar 2014 21:45:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8516BD63;
 Mon, 17 Mar 2014 21:45:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2HLj87G070571;
 Mon, 17 Mar 2014 21:45:08 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2HLj8lO070570;
 Mon, 17 Mar 2014 21:45:08 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201403172145.s2HLj8lO070570@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Mon, 17 Mar 2014 21:45:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r263274 - stable/9/sys/dev/nvme
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Mar 2014 21:45:08 -0000

Author: jimharris
Date: Mon Mar 17 21:45:08 2014
New Revision: 263274
URL: http://svnweb.freebsd.org/changeset/base/263274

Log:
  MFC r254303:
  
    If a controller fails to initialize, do not notify consumers (nvd) of its
    namespaces.
  
  Sponsored by:	Intel

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

Modified: stable/9/sys/dev/nvme/nvme.c
==============================================================================
--- stable/9/sys/dev/nvme/nvme.c	Mon Mar 17 21:42:31 2014	(r263273)
+++ stable/9/sys/dev/nvme/nvme.c	Mon Mar 17 21:45:08 2014	(r263274)
@@ -284,6 +284,15 @@ nvme_notify_consumer(struct nvme_consume
 		else
 			ctrlr_cookie = NULL;
 		ctrlr->cons_cookie[cons->id] = ctrlr_cookie;
+		if (ctrlr->is_failed) {
+			if (cons->fail_fn != NULL)
+				(*cons->fail_fn)(ctrlr_cookie);
+			/*
+			 * Do not notify consumers about the namespaces of a
+			 *  failed controller.
+			 */
+			continue;
+		}
 		for (ns_idx = 0; ns_idx < ctrlr->cdata.nn; ns_idx++) {
 			ns = &ctrlr->ns[ns_idx];
 			if (cons->ns_fn != NULL)