svn commit: r285920 - releng/10.2/sbin/nvmecontrol

[Jim Harris]

Author: jimharris
Date: Mon Jul 27 17:51:12 2015
New Revision: 285920
URL: https://svnweb.freebsd.org/changeset/base/285920

Log:
  MFS r285916:
  MFC r285796:
  
    nvmecontrol: read controller identify data before any log page operations
  
  Approved by:	re (gjb)
  Sponsored by:	Intel

Modified:
  releng/10.2/sbin/nvmecontrol/logpage.c
Directory Properties:
  releng/10.2/   (props changed)

Modified: releng/10.2/sbin/nvmecontrol/logpage.c
==============================================================================
--- releng/10.2/sbin/nvmecontrol/logpage.c	Mon Jul 27 17:50:05 2015	(r285919)
+++ releng/10.2/sbin/nvmecontrol/logpage.c	Mon Jul 27 17:51:12 2015	(r285920)
@@ -298,6 +298,8 @@ logpage(int argc, char *argv[])
 		open_dev(argv[optind], &fd, 1, 1);
 	}
 
+	read_controller_data(fd, &cdata);
+
 	/*
 	 * The log page attribtues indicate whether or not the controller
 	 * supports the SMART/Health information log page on a per
@@ -307,7 +309,6 @@ logpage(int argc, char *argv[])
 		if (log_page != NVME_LOG_HEALTH_INFORMATION)
 			errx(1, "log page %d valid only at controller level",
 			    log_page);
-		read_controller_data(fd, &cdata);
 		if (cdata.lpa.ns_smart == 0)
 			errx(1,
 			    "controller does not support per namespace "