[Midnightbsd-cvs] src [10383] sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 3 19:28:44 EDT 2018
Revision: 10383
http://svnweb.midnightbsd.org/src/?rev=10383
Author: laffer1
Date: 2018-06-03 19:28:43 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/usr.sbin/mptutil/Makefile
trunk/usr.sbin/mptutil/mpt_cam.c
trunk/usr.sbin/mptutil/mpt_cmd.c
trunk/usr.sbin/mptutil/mpt_config.c
trunk/usr.sbin/mptutil/mpt_drive.c
trunk/usr.sbin/mptutil/mpt_evt.c
trunk/usr.sbin/mptutil/mpt_show.c
trunk/usr.sbin/mptutil/mpt_volume.c
trunk/usr.sbin/mptutil/mptutil.8
Property Changed:
----------------
trunk/usr.sbin/mptutil/mptutil.8
Modified: trunk/usr.sbin/mptutil/Makefile
===================================================================
--- trunk/usr.sbin/mptutil/Makefile 2018-06-03 23:28:11 UTC (rev 10382)
+++ trunk/usr.sbin/mptutil/Makefile 2018-06-03 23:28:43 UTC (rev 10383)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/mptutil/Makefile 204352 2010-02-26 09:41:16Z ru $
PROG= mptutil
SRCS= mptutil.c mpt_cam.c mpt_cmd.c mpt_config.c mpt_drive.c mpt_evt.c \
Modified: trunk/usr.sbin/mptutil/mpt_cam.c
===================================================================
--- trunk/usr.sbin/mptutil/mpt_cam.c 2018-06-03 23:28:11 UTC (rev 10382)
+++ trunk/usr.sbin/mptutil/mpt_cam.c 2018-06-03 23:28:43 UTC (rev 10383)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$MidnightBSD$");
+__RCSID("$FreeBSD: stable/10/usr.sbin/mptutil/mpt_cam.c 302377 2016-07-06 17:45:38Z truckman $");
#include <sys/param.h>
#include <err.h>
@@ -241,8 +242,7 @@
return (ENOMEM);
/* Zero the rest of the ccb. */
- bzero(&(&ccb->ccb_h)[1], sizeof(struct ccb_scsiio) -
- sizeof(struct ccb_hdr));
+ CCB_CLEAR_ALL_EXCEPT_HDR(&ccb->csio);
scsi_read_capacity(&ccb->csio, 1, NULL, MSG_SIMPLE_Q_TAG, &rcap,
SSD_FULL_SIZE, 5000);
@@ -260,7 +260,6 @@
cam_freeccb(ccb);
return (EIO);
}
- cam_freeccb(ccb);
/*
* A last block of 2^32-1 means that the true capacity is over 2TB,
@@ -269,15 +268,15 @@
*/
if (scsi_4btoul(rcap.addr) != 0xffffffff) {
disk->maxlba = scsi_4btoul(rcap.addr);
+ cam_freeccb(ccb);
return (0);
}
/* Zero the rest of the ccb. */
- bzero(&(&ccb->ccb_h)[1], sizeof(struct ccb_scsiio) -
- sizeof(struct ccb_hdr));
+ CCB_CLEAR_ALL_EXCEPT_HDR(&ccb->csio);
scsi_read_capacity_16(&ccb->csio, 1, NULL, MSG_SIMPLE_Q_TAG, 0, 0, 0,
- &rcaplong, SSD_FULL_SIZE, 5000);
+ (uint8_t *)&rcaplong, sizeof(rcaplong), SSD_FULL_SIZE, 5000);
/* Disable freezing the device queue */
ccb->ccb_h.flags |= CAM_DEV_QFRZDIS;
@@ -355,8 +354,7 @@
return (ENOMEM);
/* Zero the rest of the ccb. */
- bzero(&(&ccb->ccb_h)[1], sizeof(struct ccb_scsiio) -
- sizeof(struct ccb_hdr));
+ CCB_CLEAR_ALL_EXCEPT_HDR(&ccb->csio);
inq_buf = calloc(1, sizeof(*inq_buf));
if (inq_buf == NULL) {
Modified: trunk/usr.sbin/mptutil/mpt_cmd.c
===================================================================
--- trunk/usr.sbin/mptutil/mpt_cmd.c 2018-06-03 23:28:11 UTC (rev 10382)
+++ trunk/usr.sbin/mptutil/mpt_cmd.c 2018-06-03 23:28:43 UTC (rev 10383)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$MidnightBSD$");
+__RCSID("$FreeBSD: stable/10/usr.sbin/mptutil/mpt_cmd.c 215046 2010-11-09 19:28:06Z jhb $");
#include <sys/param.h>
#include <sys/errno.h>
Modified: trunk/usr.sbin/mptutil/mpt_config.c
===================================================================
--- trunk/usr.sbin/mptutil/mpt_config.c 2018-06-03 23:28:11 UTC (rev 10382)
+++ trunk/usr.sbin/mptutil/mpt_config.c 2018-06-03 23:28:43 UTC (rev 10383)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$MidnightBSD$");
+__RCSID("$FreeBSD: stable/10/usr.sbin/mptutil/mpt_config.c 228990 2011-12-30 10:58:14Z uqs $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -482,7 +483,7 @@
if (state->list->drives[i]->PhysDiskID == state->target_id)
goto restart;
- /* Seach volumes second. */
+ /* Search volumes second. */
vol = state->ioc2->RaidVolume;
for (i = 0; i < state->ioc2->NumActiveVolumes; vol++, i++)
if (vol->VolumeID == state->target_id)
Modified: trunk/usr.sbin/mptutil/mpt_drive.c
===================================================================
--- trunk/usr.sbin/mptutil/mpt_drive.c 2018-06-03 23:28:11 UTC (rev 10382)
+++ trunk/usr.sbin/mptutil/mpt_drive.c 2018-06-03 23:28:43 UTC (rev 10383)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$MidnightBSD$");
+__RCSID("$FreeBSD: stable/10/usr.sbin/mptutil/mpt_drive.c 215046 2010-11-09 19:28:06Z jhb $");
#include <sys/param.h>
#include <sys/errno.h>
Modified: trunk/usr.sbin/mptutil/mpt_evt.c
===================================================================
--- trunk/usr.sbin/mptutil/mpt_evt.c 2018-06-03 23:28:11 UTC (rev 10382)
+++ trunk/usr.sbin/mptutil/mpt_evt.c 2018-06-03 23:28:43 UTC (rev 10383)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$MidnightBSD$");
+__RCSID("$FreeBSD: stable/10/usr.sbin/mptutil/mpt_evt.c 215046 2010-11-09 19:28:06Z jhb $");
#include <sys/param.h>
#include <sys/errno.h>
Modified: trunk/usr.sbin/mptutil/mpt_show.c
===================================================================
--- trunk/usr.sbin/mptutil/mpt_show.c 2018-06-03 23:28:11 UTC (rev 10382)
+++ trunk/usr.sbin/mptutil/mpt_show.c 2018-06-03 23:28:43 UTC (rev 10383)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$MidnightBSD$");
+__RCSID("$FreeBSD: stable/10/usr.sbin/mptutil/mpt_show.c 236287 2012-05-30 03:57:49Z eadler $");
#include <sys/param.h>
#include <sys/errno.h>
Modified: trunk/usr.sbin/mptutil/mpt_volume.c
===================================================================
--- trunk/usr.sbin/mptutil/mpt_volume.c 2018-06-03 23:28:11 UTC (rev 10382)
+++ trunk/usr.sbin/mptutil/mpt_volume.c 2018-06-03 23:28:43 UTC (rev 10383)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$MidnightBSD$");
+__RCSID("$FreeBSD: stable/10/usr.sbin/mptutil/mpt_volume.c 215046 2010-11-09 19:28:06Z jhb $");
#include <sys/param.h>
#include <sys/errno.h>
Modified: trunk/usr.sbin/mptutil/mptutil.8
===================================================================
--- trunk/usr.sbin/mptutil/mptutil.8 2018-06-03 23:28:11 UTC (rev 10382)
+++ trunk/usr.sbin/mptutil/mptutil.8 2018-06-03 23:28:43 UTC (rev 10383)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\"
.\" Copyright (c) 2008 Yahoo!, Inc.
.\" All rights reserved.
@@ -27,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/mptutil/mptutil.8 249373 2013-04-11 18:46:41Z joel $
.\"
.Dd August 16, 2009
.Dt MPTUTIL 8
@@ -196,7 +197,7 @@
Lists all of the physical drives attached to the controller.
.It Cm show events
Display all the entries from the controller's event log.
-Due to lack of documentation this command isn't very useful currently and
+Due to lack of documentation this command is not very useful currently and
just dumps each log entry in hex.
.It Cm show volumes
Lists all of the logical volumes managed by the controller.
@@ -354,7 +355,6 @@
utility first appeared in
.Fx 8.0 .
.Sh BUGS
-.Pp
The handling of spare drives appears to be unreliable.
The
.Xr mpt 4
@@ -389,7 +389,7 @@
.Nm
and
.Xr mpt 4
-doesn't support volumes above two terabytes.
+does not support volumes above two terabytes.
This is a limitation of the API.
If you are using this adapter with volumes larger than two terabytes, use the adapter in JBOD mode.
Utilize
Property changes on: trunk/usr.sbin/mptutil/mptutil.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list