From owner-svn-src-head@FreeBSD.ORG  Fri Jul 19 21:30:53 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C548AF5D;
 Fri, 19 Jul 2013 21:30:53 +0000 (UTC)
 (envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B7413230;
 Fri, 19 Jul 2013 21:30:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6JLUrqI059707;
 Fri, 19 Jul 2013 21:30:53 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6JLUrSI059706;
 Fri, 19 Jul 2013 21:30:53 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201307192130.r6JLUrSI059706@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Fri, 19 Jul 2013 21:30:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253473 - head/sys/dev/nvd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jul 2013 21:30:53 -0000

Author: jimharris
Date: Fri Jul 19 21:30:53 2013
New Revision: 253473
URL: http://svnweb.freebsd.org/changeset/base/253473

Log:
  Do not call disk_create() until we have completed all initialization of our
  internal disk structure.
  
  Sponsored by:	Intel
  Reviewed by:	carl
  MFC after:	3 days

Modified:
  head/sys/dev/nvd/nvd.c

Modified: head/sys/dev/nvd/nvd.c
==============================================================================
--- head/sys/dev/nvd/nvd.c	Fri Jul 19 21:16:59 2013	(r253472)
+++ head/sys/dev/nvd/nvd.c	Fri Jul 19 21:30:53 2013	(r253473)
@@ -318,8 +318,6 @@ nvd_new_disk(struct nvme_namespace *ns, 
 	    min(sizeof(disk->d_descr), NVME_MODEL_NUMBER_LENGTH));
 #endif
 
-	disk_create(disk, DISK_VERSION);
-
 	ndisk->ns = ns;
 	ndisk->disk = disk;
 	ndisk->cur_depth = 0;
@@ -335,6 +333,8 @@ nvd_new_disk(struct nvme_namespace *ns, 
 	TAILQ_INSERT_TAIL(&disk_head, ndisk, global_tailq);
 	TAILQ_INSERT_TAIL(&ctrlr->disk_head, ndisk, ctrlr_tailq);
 
+	disk_create(disk, DISK_VERSION);
+
 	return (NULL);
 }