From owner-svn-src-stable@FreeBSD.ORG  Wed Jul 24 22:44:47 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8F57CBDF;
 Wed, 24 Jul 2013 22:44:47 +0000 (UTC)
 (envelope-from jimharris@FreeBSD.org)
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 7A59D2015;
 Wed, 24 Jul 2013 22:44:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6OMilPg037660;
 Wed, 24 Jul 2013 22:44:47 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6OMilED037659;
 Wed, 24 Jul 2013 22:44:47 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201307242244.r6OMilED037659@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 24 Jul 2013 22:44:47 +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: r253629 - stable/9/sys/dev/nvd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jul 2013 22:44:47 -0000

Author: jimharris
Date: Wed Jul 24 22:44:46 2013
New Revision: 253629
URL: http://svnweb.freebsd.org/changeset/base/253629

Log:
  MFC r253473:
  
    Do not call disk_create() until we have completed all initialization of our
    internal disk structure.
  
  Approved by:	re (kib)
  Sponsored by:	Intel

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

Modified: stable/9/sys/dev/nvd/nvd.c
==============================================================================
--- stable/9/sys/dev/nvd/nvd.c	Wed Jul 24 22:43:40 2013	(r253628)
+++ stable/9/sys/dev/nvd/nvd.c	Wed Jul 24 22:44:46 2013	(r253629)
@@ -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);
 }