svn commit: r253629 - stable/9/sys/dev/nvd

[Jim Harris]

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);
 }