From owner-svn-src-all@freebsd.org  Mon Jul 27 17:51:13 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2ADE89ACF5D;
 Mon, 27 Jul 2015 17:51:13 +0000 (UTC)
 (envelope-from jimharris@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1B55D902;
 Mon, 27 Jul 2015 17:51:13 +0000 (UTC)
 (envelope-from jimharris@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6RHpCap083022;
 Mon, 27 Jul 2015 17:51:12 GMT (envelope-from jimharris@FreeBSD.org)
Received: (from jimharris@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6RHpCXu083021;
 Mon, 27 Jul 2015 17:51:12 GMT (envelope-from jimharris@FreeBSD.org)
Message-Id: <201507271751.t6RHpCXu083021@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jimharris set sender to
 jimharris@FreeBSD.org using -f
From: Jim Harris <jimharris@FreeBSD.org>
Date: Mon, 27 Jul 2015 17:51:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r285920 - releng/10.2/sbin/nvmecontrol
X-SVN-Group: releng
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.20
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, 27 Jul 2015 17:51:13 -0000

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 "