[Midnightbsd-cvs] src [11100] trunk/sbin/nvmecontrol: sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jun 19 14:14:17 EDT 2018
Revision: 11100
http://svnweb.midnightbsd.org/src/?rev=11100
Author: laffer1
Date: 2018-06-19 14:14:17 -0400 (Tue, 19 Jun 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/sbin/nvmecontrol/Makefile
trunk/sbin/nvmecontrol/devlist.c
trunk/sbin/nvmecontrol/firmware.c
trunk/sbin/nvmecontrol/identify.c
trunk/sbin/nvmecontrol/logpage.c
trunk/sbin/nvmecontrol/nvmecontrol.8
trunk/sbin/nvmecontrol/nvmecontrol.c
trunk/sbin/nvmecontrol/nvmecontrol.h
trunk/sbin/nvmecontrol/perftest.c
trunk/sbin/nvmecontrol/reset.c
Modified: trunk/sbin/nvmecontrol/Makefile
===================================================================
--- trunk/sbin/nvmecontrol/Makefile 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/Makefile 2018-06-19 18:14:17 UTC (rev 11100)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/nvmecontrol/Makefile 253476 2013-07-19 21:40:57Z jimharris $
PROG= nvmecontrol
SRCS= nvmecontrol.c devlist.c firmware.c identify.c logpage.c \
Modified: trunk/sbin/nvmecontrol/devlist.c
===================================================================
--- trunk/sbin/nvmecontrol/devlist.c 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/devlist.c 2018-06-19 18:14:17 UTC (rev 11100)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/9/sbin/nvmecontrol/devlist.c 265558 2014-05-07 16:40:44Z jimharris $");
+__FBSDID("$FreeBSD: stable/10/sbin/nvmecontrol/devlist.c 265568 2014-05-07 16:53:42Z jimharris $");
#include <sys/param.h>
Modified: trunk/sbin/nvmecontrol/firmware.c
===================================================================
--- trunk/sbin/nvmecontrol/firmware.c 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/firmware.c 2018-06-19 18:14:17 UTC (rev 11100)
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/9/sbin/nvmecontrol/firmware.c 265557 2014-05-07 16:37:04Z jimharris $");
+__FBSDID("$FreeBSD: stable/10/sbin/nvmecontrol/firmware.c 265567 2014-05-07 16:52:29Z jimharris $");
#include <sys/param.h>
#include <sys/ioccom.h>
Modified: trunk/sbin/nvmecontrol/identify.c
===================================================================
--- trunk/sbin/nvmecontrol/identify.c 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/identify.c 2018-06-19 18:14:17 UTC (rev 11100)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/nvmecontrol/identify.c 253476 2013-07-19 21:40:57Z jimharris $");
#include <sys/param.h>
Modified: trunk/sbin/nvmecontrol/logpage.c
===================================================================
--- trunk/sbin/nvmecontrol/logpage.c 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/logpage.c 2018-06-19 18:14:17 UTC (rev 11100)
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/nvmecontrol/logpage.c 285916 2015-07-27 15:34:02Z jimharris $");
#include <sys/param.h>
#include <sys/ioccom.h>
@@ -299,6 +299,8 @@
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
@@ -308,7 +310,6 @@
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 "
Modified: trunk/sbin/nvmecontrol/nvmecontrol.8
===================================================================
--- trunk/sbin/nvmecontrol/nvmecontrol.8 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/nvmecontrol.8 2018-06-19 18:14:17 UTC (rev 11100)
@@ -32,7 +32,7 @@
.\"
.\" Author: Jim Harris <jimharris at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/sbin/nvmecontrol/nvmecontrol.8 307403 2016-10-16 22:02:50Z sevan $
.\"
.Dd March 26, 2013
.Dt NVMECONTROL 8
@@ -125,7 +125,7 @@
.An -nosplit
.Nm
was developed by Intel and originally written by
-.An Jim Harris Aq jimharris at FreeBSD.org .
+.An Jim Harris Aq Mt jimharris at FreeBSD.org .
.Pp
This man page was written by
-.An Jim Harris Aq jimharris at FreeBSD.org .
+.An Jim Harris Aq Mt jimharris at FreeBSD.org .
Modified: trunk/sbin/nvmecontrol/nvmecontrol.c
===================================================================
--- trunk/sbin/nvmecontrol/nvmecontrol.c 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/nvmecontrol.c 2018-06-19 18:14:17 UTC (rev 11100)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/nvmecontrol/nvmecontrol.c 253459 2013-07-18 23:25:57Z jimharris $");
#include <sys/param.h>
#include <sys/ioccom.h>
@@ -233,4 +233,3 @@
return (0);
}
-
Modified: trunk/sbin/nvmecontrol/nvmecontrol.h
===================================================================
--- trunk/sbin/nvmecontrol/nvmecontrol.h 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/nvmecontrol.h 2018-06-19 18:14:17 UTC (rev 11100)
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sbin/nvmecontrol/nvmecontrol.h 253116 2013-07-09 21:33:12Z jimharris $
*/
#ifndef __NVMECONTROL_H__
Modified: trunk/sbin/nvmecontrol/perftest.c
===================================================================
--- trunk/sbin/nvmecontrol/perftest.c 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/perftest.c 2018-06-19 18:14:17 UTC (rev 11100)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/9/sbin/nvmecontrol/perftest.c 257708 2013-11-05 15:56:15Z jimharris $");
+__FBSDID("$FreeBSD: stable/10/sbin/nvmecontrol/perftest.c 257706 2013-11-05 15:52:38Z jimharris $");
#include <sys/param.h>
#include <sys/ioccom.h>
Modified: trunk/sbin/nvmecontrol/reset.c
===================================================================
--- trunk/sbin/nvmecontrol/reset.c 2018-06-19 18:14:07 UTC (rev 11099)
+++ trunk/sbin/nvmecontrol/reset.c 2018-06-19 18:14:17 UTC (rev 11100)
@@ -26,6 +26,7 @@
*/
#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: stable/10/sbin/nvmecontrol/reset.c 253109 2013-07-09 21:14:15Z jimharris $");
#include <sys/param.h>
#include <sys/ioccom.h>
More information about the Midnightbsd-cvs
mailing list