summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/io
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common/io')
-rw-r--r--usr/src/uts/common/io/1394/adapters/hci1394_ohci.c3
-rw-r--r--usr/src/uts/common/io/asy.c3
-rw-r--r--usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_recv.c2
-rw-r--r--usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4sp.c26
-rw-r--r--usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l5/lm_l5sp.c52
-rw-r--r--usr/src/uts/common/io/bridge.c3
-rw-r--r--usr/src/uts/common/io/busra.c3
-rw-r--r--usr/src/uts/common/io/cpqary3/cpqary3_scsi.c3
-rw-r--r--usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c5
-rw-r--r--usr/src/uts/common/io/fibre-channel/ulp/fcip.c3
-rw-r--r--usr/src/uts/common/io/gld.c7
-rw-r--r--usr/src/uts/common/io/gldutil.c11
-rw-r--r--usr/src/uts/common/io/hook.c3
-rw-r--r--usr/src/uts/common/io/ib/adapters/hermon/hermon_qpmod.c3
-rw-r--r--usr/src/uts/common/io/ib/clients/iser/iser_cm.c3
-rw-r--r--usr/src/uts/common/io/ib/clients/iser/iser_cq.c5
-rw-r--r--usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c3
-rw-r--r--usr/src/uts/common/io/ib/mgt/ibcm/ibcm_path.c3
-rw-r--r--usr/src/uts/common/io/mem.c3
-rw-r--r--usr/src/uts/common/io/multidata.c3
-rw-r--r--usr/src/uts/common/io/myri10ge/drv/myri10ge.c7
-rw-r--r--usr/src/uts/common/io/pcic.c3
-rw-r--r--usr/src/uts/common/io/ppp/sppp/sppp.c3
-rw-r--r--usr/src/uts/common/io/ppp/spppasyn/spppasyn.c5
-rw-r--r--usr/src/uts/common/io/ppp/spppcomp/spppcomp.c3
-rw-r--r--usr/src/uts/common/io/pshot.c3
-rw-r--r--usr/src/uts/common/io/rlmod.c3
-rw-r--r--usr/src/uts/common/io/rsm/rsm.c3
-rw-r--r--usr/src/uts/common/io/rsm/rsmops.c5
-rw-r--r--usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c2
-rw-r--r--usr/src/uts/common/io/scsi/impl/scsi_hba.c3
-rw-r--r--usr/src/uts/common/io/scsi/targets/sd.c4
-rw-r--r--usr/src/uts/common/io/usb/clients/ugen/ugen.c3
-rw-r--r--usr/src/uts/common/io/usb/hcd/ehci/ehci_isoch_util.c3
-rw-r--r--usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c3
-rw-r--r--usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c3
-rw-r--r--usr/src/uts/common/io/usb/usba/usba_ugen.c3
37 files changed, 119 insertions, 87 deletions
diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_ohci.c b/usr/src/uts/common/io/1394/adapters/hci1394_ohci.c
index c54556e1ba..ed79737f03 100644
--- a/usr/src/uts/common/io/1394/adapters/hci1394_ohci.c
+++ b/usr/src/uts/common/io/1394/adapters/hci1394_ohci.c
@@ -21,6 +21,7 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
@@ -2733,7 +2734,7 @@ hci1394_ohci_resume(hci1394_ohci_handle_t ohci_hdl)
/*
* re-setup OHCI bus options and config rom hdr registers. We need to
* read from the config rom using ddi_rep_get8 since it is stored as
- * a byte stream. We need to swap he config rom header and bus options
+ * a byte stream. We need to swap the config rom header and bus options
* on an X86 machine since the data is a byte stream and the OHCI
* registers expect a big endian 32-bit number.
*/
diff --git a/usr/src/uts/common/io/asy.c b/usr/src/uts/common/io/asy.c
index 709dda5156..b910e38f8a 100644
--- a/usr/src/uts/common/io/asy.c
+++ b/usr/src/uts/common/io/asy.c
@@ -26,6 +26,7 @@
/*
* Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012 Milan Jurik. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
@@ -1802,7 +1803,7 @@ asyclose(queue_t *q, int flag, cred_t *credp)
* write queue and there's a timer running, so we don't have to worry
* about them. For the untimed case, though, the user obviously made a
* mistake, because these are handled immediately. We'll terminate the
- * break now and honor his implicit request by discarding the rest of
+ * break now and honor their implicit request by discarding the rest of
* the data.
*/
if (async->async_flags & ASYNC_OUT_SUSPEND) {
diff --git a/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_recv.c b/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_recv.c
index 51a81a3352..58bc6faec3 100644
--- a/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_recv.c
+++ b/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_recv.c
@@ -82,7 +82,7 @@ static void FORCEINLINE lm_rx_set_prods( lm_device_t *pdev,
/*******************************************************************************
* Description:
* rx_chain_bd always valid, rx_chain_sge valid only in case we are LAH enabled in this queue
- * all if() checking will be always done on rx_chain_bd since he is always valid and sge should be consistent
+ * all if() checking will be always done on rx_chain_bd since it is always valid and sge should be consistent
* We verify it in case sge is valid
* all bd_xxx operations will be done on both
* Return:
diff --git a/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4sp.c b/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4sp.c
index 0a9e883f60..33fa0f1d8d 100644
--- a/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4sp.c
+++ b/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4sp.c
@@ -546,7 +546,7 @@ lm_status_t lm_tcp_init_resc(struct _lm_device_t *pdev, u8_t b_is_init )
/* Assign the SCQ chain consumer pointer to the consumer index in the status block. */
sb_id = RSS_ID_TO_SB_ID(i);
#ifdef _VBD_
- if (!CHIP_IS_E1x(pdev) && (pdev->params.l4_enable_rss == L4_RSS_DISABLED))
+ if (!CHIP_IS_E1x(pdev) && (pdev->params.l4_enable_rss == L4_RSS_DISABLED))
{
sb_id = LM_NON_RSS_SB(pdev);
}
@@ -575,7 +575,7 @@ lm_status_t lm_tcp_init_resc(struct _lm_device_t *pdev, u8_t b_is_init )
sb_id = RSS_ID_TO_SB_ID(i);
#ifdef _VBD_
- if (!CHIP_IS_E1x(pdev) && (pdev->params.l4_enable_rss == L4_RSS_DISABLED))
+ if (!CHIP_IS_E1x(pdev) && (pdev->params.l4_enable_rss == L4_RSS_DISABLED))
{
sb_id = LM_NON_RSS_SB(pdev);
}
@@ -695,10 +695,10 @@ static void _lm_tcp_init_cstorm_intmem(lm_device_t *pdev)
//LM_INTMEM_WRITE8(pdev, CSTORM_TOE_STATUS_BLOCK_ID_OFFSET(LM_TOE_FW_RSS_ID(pdev,drv_toe_rss_id), port), LM_TOE_FW_RSS_ID(pdev,drv_toe_rss_id), BAR_CSTRORM_INTMEM);
fw_sb_id = LM_FW_SB_ID(pdev, RSS_ID_TO_SB_ID(drv_toe_rss_id));
#ifdef _VBD_
- if (!CHIP_IS_E1x(pdev) && (pdev->params.l4_enable_rss == L4_RSS_DISABLED))
+ if (!CHIP_IS_E1x(pdev) && (pdev->params.l4_enable_rss == L4_RSS_DISABLED))
{
fw_sb_id = LM_FW_SB_ID(pdev, RSS_ID_TO_SB_ID(LM_NON_RSS_SB(pdev)));
- if (drv_toe_rss_id != LM_NON_RSS_CHAIN(pdev))
+ if (drv_toe_rss_id != LM_NON_RSS_CHAIN(pdev))
{
DbgBreak();
}
@@ -846,11 +846,11 @@ static void _lm_tcp_init_ustorm_intmem(lm_device_t *pdev)
break;
}
#ifdef _VBD_
- if (!CHIP_IS_E1x(pdev) && (pdev->params.l4_enable_rss == L4_RSS_DISABLED))
+ if (!CHIP_IS_E1x(pdev) && (pdev->params.l4_enable_rss == L4_RSS_DISABLED))
{
fw_sb_id = LM_FW_SB_ID(pdev, RSS_ID_TO_SB_ID(LM_NON_RSS_SB(pdev)));
sw_sb_id = LM_NON_RSS_SB(pdev);
- if (drv_toe_rss_id != LM_NON_RSS_CHAIN(pdev))
+ if (drv_toe_rss_id != LM_NON_RSS_CHAIN(pdev))
{
DbgBreak();
}
@@ -1056,7 +1056,7 @@ lm_status_t lm_tcp_init_chip_common(lm_device_t *pdev)
_lm_get_default_l4cli_params(pdev, &l4_params);
pdev->ofld_info.l4_params = l4_params;
-
+
/* init common internal memory/hw for each storm
* (c+u storms do not have common offload params) */
_lm_set_ofld_params_xstorm_common(pdev, &l4_params);
@@ -1171,7 +1171,7 @@ lm_status_t lm_tcp_init(lm_device_t *pdev)
DbgMessage(pdev, FATAL, "###lm_tcp_init is not supported for VF\n");
return LM_STATUS_SUCCESS;
}
-
+
toe_info = &pdev->toe_info;
mm_memset(toe_info, 0 , sizeof(lm_toe_info_t));
toe_info->pdev = pdev;
@@ -2586,7 +2586,7 @@ static lm_status_t _lm_tcp_init_xstorm_tcp_context(
(0 != GET_FLAGS(xtcp_st->ethernet.vlan_params, XSTORM_ETH_CONTEXT_SECTION_CFI)) ||
(0 != GET_FLAGS(xtcp_st->ethernet.vlan_params, XSTORM_ETH_CONTEXT_SECTION_PRIORITY)))
{
- // This fields should be set to 1 whenever an inner VLAN is provided by the OS.
+ // This fields should be set to 1 whenever an inner VLAN is provided by the OS.
// This flags is relevant for all function modes.
SET_FLAGS( xtcp_st->flags, XSTORM_COMMON_CONTEXT_SECTION_VLAN_MODE);
}
@@ -2612,7 +2612,7 @@ static lm_status_t _lm_tcp_init_xstorm_tcp_context(
#endif
src_ip[0] = HTON32(path->path_const.u.ipv4.src_ip);
dst_ip[0] = HTON32(path->path_const.u.ipv4.dst_ip);
- pseudo_cs = lm_tcp_calc_tcp_pseudo_checksum(pdev, src_ip, dst_ip, IP_VERSION_IPV4);
+ pseudo_cs = lm_tcp_calc_tcp_pseudo_checksum(pdev, src_ip, dst_ip, IP_VERSION_IPV4);
} else {
/* IPv6*/
xtcp_st->ip_union.ip_v6.ip_remote_addr_lo_lo = path->path_const.u.ipv6.dst_ip[0];
@@ -3875,7 +3875,7 @@ static lm_status_t lm_tcp_post_invalidate_request(
/* Desciption:
* post slow path request of given type for given tcp state
* Assumptions:
- * - caller initialized request->type according to his specific request
+ * - caller initialized request->type according to its specific request
* - caller allocated space for request->data, according to the specific request type
* - all previous slow path requests for given tcp state are already completed
* Returns:
@@ -4395,8 +4395,8 @@ lm_tcp_set_ofld_params(
/* <MichalK> Here we override the ofld info. This in theory effects iscsi as well, however, since ftsk
* does not really use timers, and passes '0' for ka / rt in delegate/cached params its ok that
- * we're overriding the parameters here. The correct solution is to maintain this per cli-idx,
- * but that will require major changes in l4 context initialization and not worth the effort.
+ * we're overriding the parameters here. The correct solution is to maintain this per cli-idx,
+ * but that will require major changes in l4 context initialization and not worth the effort.
*/
*curr_params = *params;
diff --git a/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l5/lm_l5sp.c b/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l5/lm_l5sp.c
index 43fe7064c0..a4b24baae9 100644
--- a/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l5/lm_l5sp.c
+++ b/usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l5/lm_l5sp.c
@@ -18,7 +18,7 @@ static lm_status_t lm_sc_post_init_request(
*command = ISCSI_RAMROD_CMD_ID_INIT;
*data = iscsi->ctx_phys.as_u64;
- return LM_STATUS_PENDING;
+ return LM_STATUS_PENDING;
}
@@ -40,7 +40,7 @@ static lm_status_t lm_sc_post_update_request(
spe.data.phy_address.lo = iscsi->sp_req_data.phys_addr.as_u32.low;
*data = *((u64_t*)(&(spe.data.phy_address)));
- return LM_STATUS_PENDING;
+ return LM_STATUS_PENDING;
}
@@ -48,7 +48,7 @@ static lm_status_t lm_sc_post_update_request(
/* Desciption:
* post slow path request of given type for given iscsi state
* Assumptions:
- * - caller initialized request->type according to his specific request
+ * - caller initialized request->type according to its specific request
* - caller allocated space for request->data, according to the specific request type
* - all previous slow path requests for given tcp state are already completed
* Returns:
@@ -61,7 +61,7 @@ lm_status_t lm_sc_post_slow_path_request(
lm_status_t lm_status = LM_STATUS_SUCCESS;
u64_t data = 0;
u8_t command = 0;
-
+
DbgBreakIf(!(pdev && iscsi && request));
DbgMessage(pdev, VERBOSEl5sp, "### lm_sc_post_slow_path_request cid=%d, type=%d\n", iscsi->cid, request->type);
@@ -72,7 +72,7 @@ lm_status_t lm_sc_post_slow_path_request(
lm_status = lm_sc_post_init_request(pdev, iscsi, request, &command, &data);
break;
- case SP_REQUEST_SC_UPDATE:
+ case SP_REQUEST_SC_UPDATE:
lm_status = lm_sc_post_update_request(pdev, iscsi, request, &command, &data);
break;
@@ -87,10 +87,10 @@ lm_status_t lm_sc_post_slow_path_request(
DbgMessage(pdev, VERBOSEl5sp,
"calling lm_command_post, cid=%d, command=%d, con_type=%d, data=%lx\n",
iscsi->cid, command, ISCSI_CONNECTION_TYPE, data);
- lm_command_post(pdev, iscsi->cid, command, CMD_PRIORITY_NORMAL, ISCSI_CONNECTION_TYPE/*ulp*/, data);
+ lm_command_post(pdev, iscsi->cid, command, CMD_PRIORITY_NORMAL, ISCSI_CONNECTION_TYPE/*ulp*/, data);
}
- request->status = lm_status;
+ request->status = lm_status;
return lm_status;
}
@@ -117,9 +117,9 @@ lm_status_t lm_sc_init_iscsi_state(
// NirV: sc: future statistics update
- /* the rest of the iscsi state's fields that require initialization value other than 0,
+ /* the rest of the iscsi state's fields that require initialization value other than 0,
* will be initialized later (when lm_sc_init_iscsi_context is called) */
-
+
return LM_STATUS_SUCCESS;
}
@@ -129,7 +129,7 @@ lm_status_t lm_sc_init_iscsi_state(
* delete iscsi state from lm _except_ from actual freeing of memory.
* the task of freeing of memory is done in lm_sc_free_iscsi_state()
* Assumptions:
- * global toe lock is taken by the caller
+ * global toe lock is taken by the caller
*/
void lm_sc_del_iscsi_state(
struct _lm_device_t *pdev,
@@ -139,7 +139,7 @@ void lm_sc_del_iscsi_state(
DbgMessage(pdev, VERBOSEl5sp, "###lm_sc_del_iscsi_state\n");
DbgBreakIf(!(pdev && iscsi));
- DbgBreakIf(iscsi->hdr.status >= STATE_STATUS_OFFLOAD_PENDING &&
+ DbgBreakIf(iscsi->hdr.status >= STATE_STATUS_OFFLOAD_PENDING &&
iscsi->hdr.status < STATE_STATUS_UPLOAD_DONE);
/* just a moment before we delete this connection, lets take it's info... */
@@ -151,18 +151,18 @@ void lm_sc_del_iscsi_state(
/*pdev->iscsi_info.stats.total_upld++;*/
- /* tcp->cid could have not been initialized if delete of state
+ /* tcp->cid could have not been initialized if delete of state
is a result of a failed initialization */
- DbgBreakIf(iscsi->hdr.status != STATE_STATUS_UPLOAD_DONE &&
+ DbgBreakIf(iscsi->hdr.status != STATE_STATUS_UPLOAD_DONE &&
iscsi->hdr.status != STATE_STATUS_INIT_OFFLOAD_ERR);
if (iscsi->hdr.status == STATE_STATUS_INIT_OFFLOAD_ERR) {
notify_fw = 0;
- }
-
+ }
+
lm_free_cid_resc(pdev, ISCSI_CONNECTION_TYPE, iscsi->cid, notify_fw);
- iscsi->hdr.state_blk = NULL;
+ iscsi->hdr.state_blk = NULL;
iscsi->cid = 0;
iscsi->ctx_virt = NULL;
iscsi->ctx_phys.as_u64 = 0;
@@ -178,18 +178,18 @@ lm_fc_del_fcoe_state(
DbgMessage(pdev, VERBOSEl5sp, "###lm_fc_del_fcoe_state\n");
DbgBreakIf(!(pdev && fcoe));
/*
- DbgBreakIf(fcoe->hdr.status >= STATE_STATUS_OFFLOAD_PENDING &&
+ DbgBreakIf(fcoe->hdr.status >= STATE_STATUS_OFFLOAD_PENDING &&
fcoe->hdr.status < STATE_STATUS_UPLOAD_DONE);
*/
/* remove the lm_fcoe_state from the state list */
d_list_remove_entry(&pdev->fcoe_info.run_time.fcoe_list, &fcoe->hdr.link);
- /* tcp->cid could have not been initialized if delete of state
+ /* tcp->cid could have not been initialized if delete of state
is a result of a failed initialization */
/*
- DbgBreakIf(fcoe->hdr.status != STATE_STATUS_UPLOAD_DONE &&
+ DbgBreakIf(fcoe->hdr.status != STATE_STATUS_UPLOAD_DONE &&
fcoe->hdr.status != STATE_STATUS_INIT_OFFLOAD_ERR);
*/
} /* lm_fc_del_fcoe_state */
@@ -210,27 +210,27 @@ lm_fc_init_fcoe_state(
fcoe->hdr.status = STATE_STATUS_INIT;
d_list_push_tail(&pdev->fcoe_info.run_time.fcoe_list, &fcoe->hdr.link);
- /* the rest of the fcoe state's fields that require initialization value other than 0,
+ /* the rest of the fcoe state's fields that require initialization value other than 0,
* will be initialized later (when lm_fc_init_fcoe_context is called) */
-
+
return LM_STATUS_SUCCESS;
}
void lm_sc_init_sp_req_type(
- struct _lm_device_t * pdev,
- lm_iscsi_state_t * iscsi,
- lm_iscsi_slow_path_request_t * lm_req,
+ struct _lm_device_t * pdev,
+ lm_iscsi_state_t * iscsi,
+ lm_iscsi_slow_path_request_t * lm_req,
void * req_input_data)
{
void *update_kwqe_virt;
struct protocol_common_spe spe = {0};
- switch(lm_req->type) {
+ switch(lm_req->type) {
case SP_REQUEST_SC_INIT:
break;
- case SP_REQUEST_SC_UPDATE:
+ case SP_REQUEST_SC_UPDATE:
spe.data.phy_address.hi = iscsi->sp_req_data.phys_addr.as_u32.high;
spe.data.phy_address.lo = iscsi->sp_req_data.phys_addr.as_u32.low;
diff --git a/usr/src/uts/common/io/bridge.c b/usr/src/uts/common/io/bridge.c
index 7b45039b62..97ee9f1f0e 100644
--- a/usr/src/uts/common/io/bridge.c
+++ b/usr/src/uts/common/io/bridge.c
@@ -22,6 +22,7 @@
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -2507,7 +2508,7 @@ bridge_xmit_cb(mac_handle_t mh, mac_ring_handle_t rh, mblk_t *mpnext)
/*
* We have to learn from our own transmitted packets, because
- * there may be a Solaris DLPI raw sender (who can specify his
+ * there may be a Solaris DLPI raw sender (which can specify its
* own source address) using promiscuous mode for receive. The
* mac layer information won't (and can't) tell us everything
* we need to know.
diff --git a/usr/src/uts/common/io/busra.c b/usr/src/uts/common/io/busra.c
index e37c3ba569..ada50d3fff 100644
--- a/usr/src/uts/common/io/busra.c
+++ b/usr/src/uts/common/io/busra.c
@@ -22,6 +22,7 @@
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
* Copyright 2012 Milan Jurik. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#if defined(DEBUG)
@@ -675,7 +676,7 @@ ndi_ra_alloc(dev_info_t *dip, ndi_ra_request_t *req, uint64_t *retbasep,
if (base >= mapp->ra_base &&
((base - mapp->ra_base) < mapp->ra_len)) {
/*
- * This is the node with he requested base in
+ * This is the node with the requested base in
* its range
*/
if ((len > mapp->ra_len) ||
diff --git a/usr/src/uts/common/io/cpqary3/cpqary3_scsi.c b/usr/src/uts/common/io/cpqary3/cpqary3_scsi.c
index 51d3c0288c..5409bf84fd 100644
--- a/usr/src/uts/common/io/cpqary3/cpqary3_scsi.c
+++ b/usr/src/uts/common/io/cpqary3/cpqary3_scsi.c
@@ -11,6 +11,7 @@
/*
* Copyright (C) 2013 Hewlett-Packard Development Company, L.P.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#include <sys/sdt.h>
@@ -767,7 +768,7 @@ cpqary3_synccmd_complete(cpqary3_cmdpvt_t *cpqary3_cmdpvtp)
cpqary3_synccmd_cleanup(cpqary3_cmdpvtp);
mutex_enter(&(cpqary3p->sw_mutex));
} else {
- /* submitter is waiting; wake him up */
+ /* submitter is waiting; wake it up */
cpqary3_cmdpvtp->cmdpvt_flag = 0;
/*
diff --git a/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c b/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c
index 075f1f3caf..4a4731bf90 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c
@@ -26,6 +26,7 @@
*/
/*
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#pragma ident "Copyright 2010 QLogic Corporation; ql_api.c"
@@ -4929,8 +4930,8 @@ ql_els_plogi(ql_adapter_state_t *ha, fc_packet_t *pkt)
if (CFG_IST(ha, CFG_CTRL_2425) && ha->topology & QL_N_PORT) {
/*
- * In p2p topology he sends a PLOGI after determining
- * he has the N_Port login initiative.
+ * In p2p topology it sends a PLOGI after determining
+ * it has the N_Port login initiative.
*/
ret = ql_p2p_plogi(ha, pkt);
}
diff --git a/usr/src/uts/common/io/fibre-channel/ulp/fcip.c b/usr/src/uts/common/io/fibre-channel/ulp/fcip.c
index 7e8d8dbe1b..423452e44c 100644
--- a/usr/src/uts/common/io/fibre-channel/ulp/fcip.c
+++ b/usr/src/uts/common/io/fibre-channel/ulp/fcip.c
@@ -21,6 +21,7 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -4939,7 +4940,7 @@ fcip_rt_flush(struct fcip *fptr)
* fcip_global_mutex that protects fcip_port_head must be dropped,
* our best solution is to return a value that indicates the next
* port in the list. This way the caller doesn't need to worry
- * about the race condition where he saves off a pointer to the
+ * about the race condition where it saves off a pointer to the
* next structure in the list and by the time this routine returns,
* that next structure has already been freed.
*/
diff --git a/usr/src/uts/common/io/gld.c b/usr/src/uts/common/io/gld.c
index b6a022df69..ac0abe3263 100644
--- a/usr/src/uts/common/io/gld.c
+++ b/usr/src/uts/common/io/gld.c
@@ -21,6 +21,7 @@
/*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -3475,13 +3476,13 @@ gld_fastpath(gld_t *gld, queue_t *q, mblk_t *mp)
}
/*
- * We take his fastpath request as a declaration that he will accept
+ * We take the fastpath request as a declaration that they will accept
* M_DATA messages from us, whether or not we are willing to accept
- * them from him. This allows us to have fastpath in one direction
+ * M_DATA from them. This allows us to have fastpath in one direction
* (flow upstream) even on media with Source Routing, where we are
* unable to provide a fixed MAC header to be prepended to downstream
* flowing packets. So we set GLD_FAST whether or not we decide to
- * allow him to send M_DATA down to us.
+ * allow them to send M_DATA down to us.
*/
GLDM_LOCK(macinfo, RW_WRITER);
gld->gld_flags |= GLD_FAST;
diff --git a/usr/src/uts/common/io/gldutil.c b/usr/src/uts/common/io/gldutil.c
index c3e9f2bedb..8f516b5d6e 100644
--- a/usr/src/uts/common/io/gldutil.c
+++ b/usr/src/uts/common/io/gldutil.c
@@ -20,6 +20,7 @@
*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
@@ -1676,7 +1677,7 @@ gld_unitdata_tr(gld_t *gld, mblk_t *mp)
/*
* We cannot have our client sending us "fastpath" M_DATA messages,
- * because to do that we must provide to him a fixed MAC header to
+ * because to do that we must provide a fixed MAC header to
* be prepended to each outgoing packet. But with Source Routing
* media, the length and content of the MAC header changes as the
* routes change, so there is no fixed header we can provide. So
@@ -2012,9 +2013,9 @@ gld_rcc_send(gld_mac_info_t *macinfo, queue_t *q, uchar_t *dhost,
/*
* Our caller has to take the mutex because: to avoid an extra bcopy
* of the RIF on every transmit, we pass back a pointer to our sr
- * table entry via rhp. He has to keep the mutex until he has a
+ * table entry via rhp. The caller has to keep the mutex until it has a
* chance to copy the RIF out into the outgoing packet, so that we
- * don't modify the entry while he's trying to copy it. This is a
+ * don't modify the entry while it's being copied. This is a
* little ugly, but saves the extra bcopy.
*/
ASSERT(mutex_owned(GLD_SR_MUTEX(macinfo)));
@@ -2298,11 +2299,11 @@ gld_rde_pdu_ind(gld_mac_info_t *macinfo, struct gld_ri *rh, struct rde_pdu *pdu,
ASSERT((rh->len & 1) == 0);
if (pdu->rde_ptype == RDE_RQR) {
- /* A reply to our RQC has his address as target mac */
+ /* A reply to our RQC has its address as target mac */
otherhost = pdu->rde_target_mac;
} else {
ASSERT(pdu->rde_ptype == RDE_RS);
- /* An RS has his address as orig mac */
+ /* An RS has its address as orig mac */
otherhost = pdu->rde_orig_mac;
}
diff --git a/usr/src/uts/common/io/hook.c b/usr/src/uts/common/io/hook.c
index f7ed005413..2edbe752ce 100644
--- a/usr/src/uts/common/io/hook.c
+++ b/usr/src/uts/common/io/hook.c
@@ -23,6 +23,7 @@
* Use is subject to license terms.
*
* Copyright 2013 Joyent, Inc. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#include <sys/param.h>
#include <sys/types.h>
@@ -345,7 +346,7 @@ hook_fini(void)
* ability to run and return with an error.
*
* "wantedset" is used here to determine who has the right to clear the
- * wanted but from the fw_flags set: only he that sets the flag has the
+ * wanted bit from the fw_flags set: only whomever sets the flag has the
* right to clear it at the bottom of the loop, even if someone else
* wants to set it.
*
diff --git a/usr/src/uts/common/io/ib/adapters/hermon/hermon_qpmod.c b/usr/src/uts/common/io/ib/adapters/hermon/hermon_qpmod.c
index 77c2aa4f4a..5e363b3709 100644
--- a/usr/src/uts/common/io/ib/adapters/hermon/hermon_qpmod.c
+++ b/usr/src/uts/common/io/ib/adapters/hermon/hermon_qpmod.c
@@ -21,6 +21,7 @@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -676,7 +677,7 @@ hermon_qp_modify(hermon_state_t *state, hermon_qphdl_t qp,
* If still draining SQ, then fail transition attempt
* to RTS, even though this is now done is two steps
* (see below) if the consumer has tried this before
- * it's drained, let him fail and wait appropriately
+ * it's drained, let it fail and wait appropriately
*/
if (qp->qp_sqd_still_draining) {
mutex_exit(&qp->qp_lock);
diff --git a/usr/src/uts/common/io/ib/clients/iser/iser_cm.c b/usr/src/uts/common/io/ib/clients/iser/iser_cm.c
index 516f7d1036..1dc1cbf926 100644
--- a/usr/src/uts/common/io/ib/clients/iser/iser_cm.c
+++ b/usr/src/uts/common/io/ib/clients/iser/iser_cm.c
@@ -21,6 +21,7 @@
/*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#include <sys/types.h>
@@ -248,7 +249,7 @@ iser_handle_cm_conn_est(ibt_cm_event_t *evp)
if (status != IDM_STATUS_SUCCESS) {
/*
* No IDM rsrcs or something equally Bad.
- * Return non-SUCCESS to IBCM. He'll give
+ * Return non-SUCCESS to IBCM. It'll give
* us a CONN_CLOSED, which we'll handle
* below.
*/
diff --git a/usr/src/uts/common/io/ib/clients/iser/iser_cq.c b/usr/src/uts/common/io/ib/clients/iser/iser_cq.c
index 110bda2259..6a8f1d755c 100644
--- a/usr/src/uts/common/io/ib/clients/iser/iser_cq.c
+++ b/usr/src/uts/common/io/ib/clients/iser/iser_cq.c
@@ -21,6 +21,7 @@
/*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#include <sys/types.h>
@@ -199,7 +200,7 @@ iser_ib_poll_send_completions(ibt_cq_hdl_t cq_hdl, iser_chan_t *iser_chan)
/*
* Tell IDM that the channel has gone down,
- * unless he already knows.
+ * unless it already knows.
*/
mutex_enter(&iser_conn->ic_lock);
switch (iser_conn->ic_stage) {
@@ -414,7 +415,7 @@ iser_ib_poll_recv_completions(ibt_cq_hdl_t cq_hdl, iser_chan_t *iser_chan)
if (wc.wc_status != IBT_WC_SUCCESS) {
/*
* Tell IDM that the channel has gone down,
- * unless he already knows.
+ * unless it already knows.
*/
switch (iser_chan->ic_conn->ic_stage) {
case ISER_CONN_STAGE_IC_DISCONNECTED:
diff --git a/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c b/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c
index 4c60636b38..24b88c94f1 100644
--- a/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c
+++ b/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -362,7 +363,7 @@ rdsv3_notify_queue_get(struct rdsv3_sock *rs, struct msghdr *msghdr)
* in the user provided cmsg buffer. We don't try to copy more, to avoid
* losing notifications - except when the buffer is so small that
* it wouldn't
- * even hold a single notification. Then we give him as much of this
+ * even hold a single notification. Then we give as much of this
* single
* msg as we can squeeze in, and set MSG_CTRUNC.
*/
diff --git a/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_path.c b/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_path.c
index af4cb5f8e3..7d1e625863 100644
--- a/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_path.c
+++ b/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_path.c
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#include <sys/ib/mgt/ibcm/ibcm_impl.h>
@@ -1621,7 +1622,7 @@ ibcm_get_multi_pathrec(ibcm_path_tqargs_t *p_arg, ibtl_cm_port_list_t *sl,
/*
* If SGID and/or DGID is specified by user, make sure
- * he gets his primary-path on those node points.
+ * they get their primary-path on those node points.
*/
for (i = 0; i < num_rec; i++, pr_resp++) {
IBTF_DPRINTF_L3(cmlog, "ibcm_get_multi_pathrec:"
diff --git a/usr/src/uts/common/io/mem.c b/usr/src/uts/common/io/mem.c
index cdbeb0d422..d47ba05074 100644
--- a/usr/src/uts/common/io/mem.c
+++ b/usr/src/uts/common/io/mem.c
@@ -21,6 +21,7 @@
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -903,7 +904,7 @@ mmsegmap(dev_t dev, off_t off, struct as *as, caddr_t *addrp, off_t len,
* Make /dev/mem mappings non-consistent since we can't
* alias pages that don't have page structs behind them,
* such as kernel stack pages. If someone mmap()s a kernel
- * stack page and if we give him a tte with cv, a line from
+ * stack page and if we give them a tte with cv, a line from
* that page can get into both pages of the spitfire d$.
* But snoop from another processor will only invalidate
* the first page. This later caused kernel (xc_attention)
diff --git a/usr/src/uts/common/io/multidata.c b/usr/src/uts/common/io/multidata.c
index ebef8ec32c..459914ab5d 100644
--- a/usr/src/uts/common/io/multidata.c
+++ b/usr/src/uts/common/io/multidata.c
@@ -22,6 +22,7 @@
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -1291,7 +1292,7 @@ mmd_addpattr(multidata_t *mmd, pdesc_t *pd, pattrinfo_t *pai,
if (tbl == NULL)
return (NULL);
- /* if someone got there first, use his table instead */
+ /* if someone got there first, use their table instead */
if ((o_tbl = atomic_cas_ptr(tbl_p, NULL, tbl)) != NULL) {
kmem_cache_free(pattbl_cache, tbl);
tbl = o_tbl;
diff --git a/usr/src/uts/common/io/myri10ge/drv/myri10ge.c b/usr/src/uts/common/io/myri10ge/drv/myri10ge.c
index f855b0a177..256471ad47 100644
--- a/usr/src/uts/common/io/myri10ge/drv/myri10ge.c
+++ b/usr/src/uts/common/io/myri10ge/drv/myri10ge.c
@@ -31,6 +31,7 @@
/*
* Copyright (c) 2014, Joyent, Inc.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#ifndef lint
@@ -2138,11 +2139,11 @@ myri10ge_start_locked(struct myri10ge_priv *mgp)
}
/*
- * Tell the MCP how many buffers he has, and to
+ * Tell the MCP how many buffers it has, and to
* bring the ethernet interface up
*
* Firmware needs the big buff size as a power of 2. Lie and
- * tell him the buffer is larger, because we only use 1
+ * tell it the buffer is larger, because we only use 1
* buffer/pkt, and the mtu will prevent overruns
*/
big_pow2 = myri10ge_mtu + MXGEFW_PAD;
@@ -2563,7 +2564,7 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, uint32_t mcp_index)
}
if (tx->req == tx->done && tx->stop != NULL) {
/*
- * Nic has sent all pending requests, allow him
+ * Nic has sent all pending requests, allow it
* to stop polling this queue
*/
mutex_enter(&tx->lock);
diff --git a/usr/src/uts/common/io/pcic.c b/usr/src/uts/common/io/pcic.c
index a05e7fa112..fbc7cf1f1e 100644
--- a/usr/src/uts/common/io/pcic.c
+++ b/usr/src/uts/common/io/pcic.c
@@ -22,6 +22,7 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -2646,7 +2647,7 @@ pcic_calc_speed(pcicdev_t *pcic, uint32_t speed)
* Generally the larger value is taken if 2 are possible.
*/
static struct pcic_card_times {
- uint16_t cycle; /* Speed as found in the atribute space of he card. */
+ uint16_t cycle; /* Speed as found in the atribute space of the card. */
uint16_t setup; /* Corresponding address setup time. */
uint16_t width; /* Corresponding width, OE or WE. */
uint16_t hold; /* Corresponding data or address hold time. */
diff --git a/usr/src/uts/common/io/ppp/sppp/sppp.c b/usr/src/uts/common/io/ppp/sppp/sppp.c
index c810a37dec..7aee946b5f 100644
--- a/usr/src/uts/common/io/ppp/sppp/sppp.c
+++ b/usr/src/uts/common/io/ppp/sppp/sppp.c
@@ -3,6 +3,7 @@
*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation is hereby granted, provided that the above copyright
@@ -201,7 +202,7 @@ sppp_open(queue_t *q, dev_t *devp, int oflag, int sflag, cred_t *credp)
/*
* Free storage used by a PPA. This is not called until the last PPA
- * user closes his connection or reattaches to a different PPA.
+ * user closes their connection or reattaches to a different PPA.
*/
static void
sppp_free_ppa(sppa_t *ppa)
diff --git a/usr/src/uts/common/io/ppp/spppasyn/spppasyn.c b/usr/src/uts/common/io/ppp/spppasyn/spppasyn.c
index 45b94b2bb9..8aa9a08734 100644
--- a/usr/src/uts/common/io/ppp/spppasyn/spppasyn.c
+++ b/usr/src/uts/common/io/ppp/spppasyn/spppasyn.c
@@ -3,6 +3,7 @@
*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation is hereby granted, provided that the above copyright
@@ -1541,9 +1542,9 @@ ahdlc_decode(queue_t *q, mblk_t *mp)
* If the peer sends us a character that's in
* our receive character map, then that's
* junk. Discard it without changing state.
- * If he previously sent us an escape
+ * If they previously sent us an escape
* character, then toggle this one and
- * continue. Otherwise, if he's now sending
+ * continue. Otherwise, if they're now sending
* escape, set the flag for next time.
*/
if (IN_RX_MAP(chr, state->sa_raccm)) {
diff --git a/usr/src/uts/common/io/ppp/spppcomp/spppcomp.c b/usr/src/uts/common/io/ppp/spppcomp/spppcomp.c
index 1179d817de..db449a07db 100644
--- a/usr/src/uts/common/io/ppp/spppcomp/spppcomp.c
+++ b/usr/src/uts/common/io/ppp/spppcomp/spppcomp.c
@@ -3,6 +3,7 @@
*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation is hereby granted, provided that the above copyright
@@ -1186,7 +1187,7 @@ spppcomp_rput(queue_t *q, mblk_t *mp)
cp->cp_lastfinish = gethrtime();
}
} else {
- /* Deferring; give him a clean slate */
+ /* Deferring; provide a clean slate */
cp->cp_fastin = 0;
#ifdef SPC_DEBUG
cp->cp_in_queued++;
diff --git a/usr/src/uts/common/io/pshot.c b/usr/src/uts/common/io/pshot.c
index bc5c328d6b..f141d541e3 100644
--- a/usr/src/uts/common/io/pshot.c
+++ b/usr/src/uts/common/io/pshot.c
@@ -24,6 +24,7 @@
*/
/*
* Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -38,7 +39,7 @@
* The pshot driver is rooted at /devices/pshot. The following commands
* illustrate the operation of devfs together with pshot's bus_config.
* The first command demonstrates that, like the magician showing there's
- * nothing up his sleeve, /devices/pshot is empty. The second command
+ * nothing up their sleeve, /devices/pshot is empty. The second command
* conjures up a branch of pshot nodes. Note that pshot's bus_config is
* called sequentially by devfs for each node, as part of the pathname
* resolution, and that each pshot node is fully configured and
diff --git a/usr/src/uts/common/io/rlmod.c b/usr/src/uts/common/io/rlmod.c
index a3b9a50a74..2208656adf 100644
--- a/usr/src/uts/common/io/rlmod.c
+++ b/usr/src/uts/common/io/rlmod.c
@@ -22,6 +22,7 @@
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
@@ -1000,7 +1001,7 @@ rlwinctl(queue_t *q, mblk_t *mp)
TRACE_2(TR_FAC_RLOGINP, TR_RLOGINP_WINCTL_IN, "rlwinctl start: q %p, "
"mp %p", q, mp);
- rmip->oobdata[0] &= ~TIOCPKT_WINDOW; /* we know he heard */
+ rmip->oobdata[0] &= ~TIOCPKT_WINDOW; /* we know they heard */
if ((rl_msgp = mkiocb(TIOCSWINSZ)) == NULL) {
TRACE_2(TR_FAC_RLOGINP, TR_RLOGINP_WINCTL_OUT, "rlwinctl end: "
diff --git a/usr/src/uts/common/io/rsm/rsm.c b/usr/src/uts/common/io/rsm/rsm.c
index b0c93e7d8a..d00367ca95 100644
--- a/usr/src/uts/common/io/rsm/rsm.c
+++ b/usr/src/uts/common/io/rsm/rsm.c
@@ -22,6 +22,7 @@
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
* Copyright 2012 Milan Jurik. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
@@ -6642,7 +6643,7 @@ rsm_closeconnection(rsmseg_t *seg, void **cookie)
* Disconnect on adapter
*
* The current algorithm is stateless, I don't have to contact
- * server when I go away. He only gives me permissions. Of course,
+ * server when I go away. It only gives me permissions. Of course,
* the adapters will talk to terminate the connect.
*
* disconnect is needed only if we are CONNECTED not in CONN_QUIESCE
diff --git a/usr/src/uts/common/io/rsm/rsmops.c b/usr/src/uts/common/io/rsm/rsmops.c
index e61eee4be0..a1c9b792bb 100644
--- a/usr/src/uts/common/io/rsm/rsmops.c
+++ b/usr/src/uts/common/io/rsm/rsmops.c
@@ -21,6 +21,7 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#include <sys/types.h>
@@ -291,7 +292,7 @@ rsm_get_controller(const char *name, uint_t number,
* First check if the driver is registered
*/
if ((p_drv = find_rsmpi_driver(name)) == NULL) {
- /* Cannot find the driver. Try to load him */
+ /* Cannot find the driver. Try to load it */
mutex_exit(&rsmops_lock);
if ((error = modload("drv", (char *)name)) == -1) {
return (RSMERR_CTLR_NOT_PRESENT);
@@ -462,7 +463,7 @@ rsm_register_controller(const char *name, uint_t number,
/*
* This is expected to be called from the driver's detach function
* if this function returns EBUSY, the driver is supposed to fail
- * his own detach operation
+ * its own detach operation
*/
int
rsm_unregister_controller(const char *name, uint_t number)
diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
index 00668133ec..d996c5f867 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
@@ -23,6 +23,7 @@
*/
/*
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -8349,7 +8350,6 @@ vhci_uscsi_send_sense(struct scsi_pkt *pkt, mp_uscsi_cmd_t *mp_uscmdp)
if (scsi_pkt_allocated_correctly(rqpkt))
rqpkt->pkt_path_instance = 0;
- /* get her done */
switch (scsi_transport(rqpkt)) {
case TRAN_ACCEPT:
VHCI_DEBUG(1, (CE_NOTE, NULL, "vhci_uscsi_send_sense: "
diff --git a/usr/src/uts/common/io/scsi/impl/scsi_hba.c b/usr/src/uts/common/io/scsi/impl/scsi_hba.c
index 2c7bdb0f2e..8da143270a 100644
--- a/usr/src/uts/common/io/scsi/impl/scsi_hba.c
+++ b/usr/src/uts/common/io/scsi/impl/scsi_hba.c
@@ -22,6 +22,7 @@
/*
* Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#include <sys/note.h>
@@ -6973,7 +6974,7 @@ typedef struct scsi_lunrpt {
* to allocate a buffer of sufficient size, and reissue the command. If the
* first command succeeds, but the second fails, we return whatever we were
* able to get the first time. We return enough information for the caller to
- * tell whether he got all the LUNs or only a subset.
+ * tell whether they got all the LUNs or only a subset.
*
* If successful, we allocate an array of scsi_lun_t to hold the results. The
* caller must kmem_free(*lunarrayp, *sizep) when finished with it. Upon
diff --git a/usr/src/uts/common/io/scsi/targets/sd.c b/usr/src/uts/common/io/scsi/targets/sd.c
index ae1e7e0fc3..50946d4b1e 100644
--- a/usr/src/uts/common/io/scsi/targets/sd.c
+++ b/usr/src/uts/common/io/scsi/targets/sd.c
@@ -24,7 +24,7 @@
*/
/*
* Copyright (c) 2011 Bayard G. Bell. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
* Copyright 2012 DEY Storage Systems, Inc. All rights reserved.
*/
@@ -27655,7 +27655,7 @@ sr_read_all_subcodes(dev_t dev, caddr_t data, int flag)
cdb[10] = 1;
} else {
/*
- * Note: A vendor specific command (0xDF) is being used her to
+ * Note: A vendor specific command (0xDF) is being used here to
* request a read of all subcodes.
*/
cdb[0] = (char)SCMD_READ_ALL_SUBCODES;
diff --git a/usr/src/uts/common/io/usb/clients/ugen/ugen.c b/usr/src/uts/common/io/usb/clients/ugen/ugen.c
index efc7628a19..b07c263323 100644
--- a/usr/src/uts/common/io/usb/clients/ugen/ugen.c
+++ b/usr/src/uts/common/io/usb/clients/ugen/ugen.c
@@ -20,6 +20,7 @@
*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
@@ -30,7 +31,7 @@
* to talk to USB devices. This is very useful for Point of Sale sale
* devices and other simple devices like USB scanner, USB palm pilot.
* The UGEN provides a system call interface to USB devices enabling
- * a USB device vendor to write an application for his
+ * a USB device vendor to write an application for their
* device instead of writing a driver. This facilitates the vendor to write
* device management s/w quickly in userland.
*
diff --git a/usr/src/uts/common/io/usb/hcd/ehci/ehci_isoch_util.c b/usr/src/uts/common/io/usb/hcd/ehci/ehci_isoch_util.c
index fa1968cd0e..b702ff5e01 100644
--- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_isoch_util.c
+++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_isoch_util.c
@@ -21,6 +21,7 @@
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -869,7 +870,7 @@ void ehci_insert_itd_on_itw(
* ehci_insert_itd_into_active_list:
*
* Add current ITD into the active ITD list in reverse order.
- * When he done list is created, remove it in the reverse order.
+ * When the done list is created, remove it in the reverse order.
*/
void
ehci_insert_itd_into_active_list(
diff --git a/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c b/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c
index 19b5ebdde6..5737b9c3e1 100644
--- a/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c
+++ b/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c
@@ -21,6 +21,7 @@
/*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -326,7 +327,7 @@ ohci_hcdi_polled_read(
/*
* To make sure after we get the done list from DoneHead,
- * every input device get his own TD's in the
+ * every input device gets its own TD's in the
* ohci_polled_done_list and then clear the interrupt status.
*/
if (intr & HCR_INTR_WDH) {
diff --git a/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c b/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c
index 8f973393e8..9b3dc40c7e 100644
--- a/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c
+++ b/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c
@@ -21,6 +21,7 @@
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
@@ -3889,7 +3890,7 @@ scsa2usb_rw_transport(scsa2usb_state_t *scsa2usbp, struct scsi_pkt *pkt)
cmd->cmd_blksize = (int)blk_size;
/*
- * Having figure out the 'partial' xfer len based on he
+ * Having figured out the 'partial' xfer len based on the
* block size; fill it in to the cmd->cmd_cdb
*/
cmd->cmd_cdb[SCSA2USB_OPCODE] = (uchar_t)opcode;
diff --git a/usr/src/uts/common/io/usb/usba/usba_ugen.c b/usr/src/uts/common/io/usb/usba/usba_ugen.c
index 5852e40799..94ca057acf 100644
--- a/usr/src/uts/common/io/usb/usba/usba_ugen.c
+++ b/usr/src/uts/common/io/usb/usba/usba_ugen.c
@@ -20,6 +20,7 @@
*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
/*
@@ -36,7 +37,7 @@
* to talk to USB devices. This is very useful for Point of Sale sale
* devices and other simple devices like USB scanner, USB palm pilot.
* The UGEN provides a system call interface to USB devices enabling
- * a USB device vendor to write an application for his
+ * a USB device vendor to write an application for their
* device instead of writing a driver. This facilitates the vendor to write
* device management s/w quickly in userland.
*