diff options
| author | Daniel Hoffman <dj.hoffman@delphix.com> | 2017-02-17 11:48:20 -0800 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2017-02-22 11:43:07 -0800 |
| commit | 48bbca816818409505a6e214d0911fda44e622e3 (patch) | |
| tree | 7b823654982b246c7df6ae378d344139fde35b51 /usr/src/uts/common | |
| parent | e40108ff341f07fe03e96c751c6cf2cb5867d1a8 (diff) | |
| download | illumos-joyent-48bbca816818409505a6e214d0911fda44e622e3.tar.gz | |
7812 Remove gender specific language
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Steve Gonczi <steve.gonczi@delphix.com>
Reviewed by: Chris Williamson <chris.williamson@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/uts/common')
83 files changed, 226 insertions, 158 deletions
diff --git a/usr/src/uts/common/avs/ncall/ncall.c b/usr/src/uts/common/avs/ncall/ncall.c index 3627ed656a..ccf6648bc3 100644 --- a/usr/src/uts/common/avs/ncall/ncall.c +++ b/usr/src/uts/common/avs/ncall/ncall.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. */ /* @@ -720,7 +721,7 @@ ncallgetnodes(intptr_t uaddr, int mode, int *rvalp) /* * If the user passes up a null address argument, then - * he/she doesn't want the actual nodes, but the configured + * they don't want the actual nodes, but the configured * maximum, so space can be correctly allocated. */ diff --git a/usr/src/uts/common/avs/ns/rdc/rdc_health.c b/usr/src/uts/common/avs/ns/rdc/rdc_health.c index 27ae62a590..16bc34242d 100644 --- a/usr/src/uts/common/avs/ns/rdc/rdc_health.c +++ b/usr/src/uts/common/avs/ns/rdc/rdc_health.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. */ /* @@ -413,7 +414,7 @@ rdc_lookup_host(char *host) /* * Handle the RDC_LINK_DOWN ioctl. - * The user specifies which host he is interested in. + * The user specifies which host they're interested in. * This function is woken up when the link to that host goes down. */ diff --git a/usr/src/uts/common/disp/priocntl.c b/usr/src/uts/common/disp/priocntl.c index 0101d12432..5412df83f5 100644 --- a/usr/src/uts/common/disp/priocntl.c +++ b/usr/src/uts/common/disp/priocntl.c @@ -22,6 +22,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -800,7 +801,7 @@ proccmp(proc_t *pp, struct pcmpargs *argp) if (*argp->pcmp_retthreadp == NULL) { /* * First time through for this set. - * keep the mutex held. He might be the one! + * keep the mutex held. It might be the one! */ *argp->pcmp_retthreadp = ty; } else { diff --git a/usr/src/uts/common/fs/doorfs/door_sys.c b/usr/src/uts/common/fs/doorfs/door_sys.c index b11a5f0d7c..f2c22ec249 100644 --- a/usr/src/uts/common/fs/doorfs/door_sys.c +++ b/usr/src/uts/common/fs/doorfs/door_sys.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -1496,7 +1497,7 @@ out: mutex_enter(&door_knob); DOOR_T_RELEASE(ct); - /* let the client know we have processed his message */ + /* let the client know we have processed its message */ ct->d_args_done = 1; if (error) { diff --git a/usr/src/uts/common/fs/namefs/namevno.c b/usr/src/uts/common/fs/namefs/namevno.c index e1f8590718..56c732e0fe 100644 --- a/usr/src/uts/common/fs/namefs/namevno.c +++ b/usr/src/uts/common/fs/namefs/namevno.c @@ -24,6 +24,7 @@ /* * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -304,7 +305,7 @@ nm_setattr( * bits. * If the system was configured with the "rstchown" option, the * owner is not permitted to give away the file, and can change - * the group id only to a group of which he or she is a member. + * the group id only to a group of which they are a member. */ if (mask & AT_UID) nmvap->va_uid = vap->va_uid; diff --git a/usr/src/uts/common/fs/nfs/nfs4_srv.c b/usr/src/uts/common/fs/nfs/nfs4_srv.c index 0865deb91d..814ac758d4 100644 --- a/usr/src/uts/common/fs/nfs/nfs4_srv.c +++ b/usr/src/uts/common/fs/nfs/nfs4_srv.c @@ -22,7 +22,7 @@ /* * Copyright 2016 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2012, 2016 by Delphix. All rights reserved. */ /* @@ -2769,7 +2769,7 @@ do_rfs4_op_lookup(char *nm, struct svc_req *req, struct compound_state *cs) /* * Now we do a checkauth4. The reason is that * this client/user may not have access to the new - * exported file system, and if he does, + * exported file system, and if they do, * the client/user may be mapped to a different uid. * * We start with a new cr, because the checkauth4 done @@ -3964,7 +3964,7 @@ rfs4_op_release_lockowner(nfs_argop4 *argop, nfs_resop4 *resop, * We need to unhide the lockowner so the client can * try it again. The bad thing here is if the client * has a logic error that took it here in the first place - * he probably has lost accounting of the locks that it + * they probably have lost accounting of the locks that it * is holding. So we may have dangling state until the * open owner state is reaped via close. One scenario * that could possibly occur is that the client has diff --git a/usr/src/uts/common/fs/nfs/nfs_srv.c b/usr/src/uts/common/fs/nfs/nfs_srv.c index 054a6d1233..0588c5643e 100644 --- a/usr/src/uts/common/fs/nfs/nfs_srv.c +++ b/usr/src/uts/common/fs/nfs/nfs_srv.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -829,7 +830,7 @@ rfs_read(struct nfsreadargs *ra, struct nfsrdresult *rr, /* * Get attributes again so we can send the latest access - * time to the client side for his cache. + * time to the client side for its cache. */ va.va_mask = AT_ALL; @@ -1104,7 +1105,7 @@ rfs_write_sync(struct nfswriteargs *wa, struct nfsattrstat *ns, if (!error) { /* * Get attributes again so we send the latest mod - * time to the client side for his cache. + * time to the client side for its cache. */ va.va_mask = AT_ALL; /* now we want everything */ @@ -1600,7 +1601,7 @@ rfs_write(struct nfswriteargs *wa, struct nfsattrstat *ns, data_written = 1; /* * Get attributes again so we send the latest mod - * time to the client side for his cache. + * time to the client side for its cache. */ va.va_mask = AT_ALL; /* now we want everything */ diff --git a/usr/src/uts/common/fs/nfs/nfs_subr.c b/usr/src/uts/common/fs/nfs/nfs_subr.c index ab54033a81..7ffb4591bb 100644 --- a/usr/src/uts/common/fs/nfs/nfs_subr.c +++ b/usr/src/uts/common/fs/nfs/nfs_subr.c @@ -25,6 +25,7 @@ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/param.h> @@ -5129,7 +5130,7 @@ nfs_mount_label_policy(vfs_t *vfsp, struct netbuf *addr, * mounts into the global zone itself; restrict these to * read-only.) * - * If the requestor is in some other zone, but his label + * If the requestor is in some other zone, but their label * dominates the server, then allow read-down. * * Otherwise, access is denied. diff --git a/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vfsops.c b/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vfsops.c index 40f981d46f..49dd820a97 100644 --- a/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vfsops.c +++ b/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vfsops.c @@ -35,6 +35,7 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/systm.h> @@ -989,7 +990,7 @@ smbfs_mount_label_policy(vfs_t *vfsp, void *ipaddr, int addr_type, cred_t *cr) * mounts into the global zone itself; restrict these to * read-only.) * - * If the requestor is in some other zone, but his label + * If the requestor is in some other zone, but their label * dominates the server, then allow read-down. * * Otherwise, access is denied. diff --git a/usr/src/uts/common/fs/smbsrv/smb_ofile.c b/usr/src/uts/common/fs/smbsrv/smb_ofile.c index 582091d1dd..29097db53a 100644 --- a/usr/src/uts/common/fs/smbsrv/smb_ofile.c +++ b/usr/src/uts/common/fs/smbsrv/smb_ofile.c @@ -22,6 +22,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright 2016 Syneto S.R.L. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -153,7 +154,7 @@ * number of references to the ofile in other structures (such as an smb * request). The reference count is not incremented in these 2 instances: * - * 1) The ofile is open. An ofile is anchored by his state. If there's + * 1) The ofile is open. An ofile is anchored by its state. If there's * no activity involving an ofile currently open, the reference count * of that ofile is zero. * diff --git a/usr/src/uts/common/fs/smbsrv/smb_tree.c b/usr/src/uts/common/fs/smbsrv/smb_tree.c index 3faf17ea20..2f1e1b50e2 100644 --- a/usr/src/uts/common/fs/smbsrv/smb_tree.c +++ b/usr/src/uts/common/fs/smbsrv/smb_tree.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -154,7 +155,7 @@ * number of references to the tree in other structures (such as an smb * request). The reference count is not incremented in these 2 instances: * - * 1) The tree is connected. An tree is anchored by his state. If there's + * 1) The tree is connected. An tree is anchored by its state. If there's * no activity involving a tree currently connected, the reference * count of that tree is zero. * diff --git a/usr/src/uts/common/fs/smbsrv/smb_user.c b/usr/src/uts/common/fs/smbsrv/smb_user.c index 7f43d188c9..75e1883bfe 100644 --- a/usr/src/uts/common/fs/smbsrv/smb_user.c +++ b/usr/src/uts/common/fs/smbsrv/smb_user.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -101,21 +102,21 @@ * SMB_USER_STATE_LOGGING_ON * * While in this state: - * - The user is in the list of users for his session. + * - The user is in the list of users for their session. * - References will be given out ONLY for session setup. * - This user can not access anything yet. * * SMB_USER_STATE_LOGGED_ON * * While in this state: - * - The user is in the list of users for his session. + * - The user is in the list of users for their session. * - References will be given out if the user is looked up. * - The user can access files and pipes. * * SMB_USER_STATE_LOGGING_OFF * * While in this state: - * - The user is in the list of users for his session. + * - The user is in the list of users for their session. * - References will not be given out if the user is looked up. * - The trees the user connected are being disconnected. * - The resources associated with the user remain. @@ -123,7 +124,7 @@ * SMB_USER_STATE_LOGGED_OFF * * While in this state: - * - The user is queued in the list of users of his session. + * - The user is queued in the list of users of their session. * - References will not be given out if the user is looked up. * - The user has no more trees connected. * - The resources associated with the user remain. @@ -167,7 +168,7 @@ * -------- * * The state machine of the user structures is controlled by 3 elements: - * - The list of users of the session he belongs to. + * - The list of users of the session they belong to. * - The mutex embedded in the structure itself. * - The reference count. * @@ -191,7 +192,7 @@ * number of references to the user in other structures (such as an smb * request). The reference count is not incremented in these 2 instances: * - * 1) The user is logged in. An user is anchored by his state. If there's + * 1) The user is logged in. An user is anchored by their state. If there's * no activity involving a user currently logged in, the reference * count of that user is zero. * diff --git a/usr/src/uts/common/fs/ufs/quota_ufs.c b/usr/src/uts/common/fs/ufs/quota_ufs.c index 490d0d1113..120aaed1ee 100644 --- a/usr/src/uts/common/fs/ufs/quota_ufs.c +++ b/usr/src/uts/common/fs/ufs/quota_ufs.c @@ -21,6 +21,7 @@ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -313,8 +314,8 @@ chkdq(struct inode *ip, long change, int force, struct cred *cr, /* * Disallow allocation if it would bring the current usage over - * the hard limit or if the user is over his soft limit and his time - * has run out. + * the hard limit or if the user is over their soft limit and their + * time has run out. */ if (dqp->dq_bhardlimit && ncurblocks >= (uint64_t)dqp->dq_bhardlimit && !force) { @@ -512,8 +513,8 @@ chkiq(struct ufsvfs *ufsvfsp, int change, struct inode *ip, uid_t uid, /* * Dissallow allocation if it would bring the current usage over - * the hard limit or if the user is over his soft limit and his time - * has run out. + * the hard limit or if the user is over their soft limit and their + * time has run out. */ if (change == 1 && ncurfiles >= dqp->dq_fhardlimit && dqp->dq_fhardlimit && !force) { diff --git a/usr/src/uts/common/fs/ufs/ufs_inode.c b/usr/src/uts/common/fs/ufs/ufs_inode.c index ebb3fd6e9c..ef09f7d32c 100644 --- a/usr/src/uts/common/fs/ufs/ufs_inode.c +++ b/usr/src/uts/common/fs/ufs/ufs_inode.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1983, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -1688,7 +1689,7 @@ ufs_scan_inodes(int rwtry, int (*func)(struct inode *, void *), void *arg, * ufs_iget(). This works because ufs_iget() * acquires the contents lock before putting * the inode into the cache. If we can lock - * it, then he's done with it. + * it, then ufs_iget() is done with it. */ if (rwtry) { diff --git a/usr/src/uts/common/fs/ufs/ufs_vnops.c b/usr/src/uts/common/fs/ufs/ufs_vnops.c index cf45b48e3c..898be4d7b2 100644 --- a/usr/src/uts/common/fs/ufs/ufs_vnops.c +++ b/usr/src/uts/common/fs/ufs/ufs_vnops.c @@ -22,6 +22,7 @@ /* * Copyright (c) 1984, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2015, Joyent, Inc. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -5439,7 +5440,7 @@ ufs_putapage( } /* * If the pager is trying to push a page in the bad range - * just tell him to try again later when things are better. + * just tell it to try again later when things are better. */ if (flags & B_ASYNC) { err = EAGAIN; diff --git a/usr/src/uts/common/fs/zfs/zfs_dir.c b/usr/src/uts/common/fs/zfs/zfs_dir.c index 46f3903eed..e1f27cc68b 100644 --- a/usr/src/uts/common/fs/zfs/zfs_dir.c +++ b/usr/src/uts/common/fs/zfs/zfs_dir.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013, 2015 by Delphix. All rights reserved. + * Copyright (c) 2013, 2016 by Delphix. All rights reserved. * Copyright 2017 Nexenta Systems, Inc. */ @@ -287,8 +287,8 @@ zfs_dirent_lock(zfs_dirlock_t **dlpp, znode_t *dzp, char *name, znode_t **zpp, * dl_name in case the first thread goes away before we do. * Note that we initialize the new name before storing its * pointer into dl_name, because the first thread may load - * dl->dl_name at any time. He'll either see the old value, - * which is his, or the new shared copy; either is OK. + * dl->dl_name at any time. It'll either see the old value, + * which belongs to it, or the new shared copy; either is OK. */ dl->dl_namesize = strlen(dl->dl_name) + 1; name = kmem_alloc(dl->dl_namesize, KM_SLEEP); diff --git a/usr/src/uts/common/fs/zfs/zio.c b/usr/src/uts/common/fs/zfs/zio.c index 652c17afcd..cca1daa81e 100644 --- a/usr/src/uts/common/fs/zfs/zio.c +++ b/usr/src/uts/common/fs/zfs/zio.c @@ -1679,7 +1679,7 @@ zio_reexecute(zio_t *pio) /* * Now that all children have been reexecuted, execute the parent. * We don't reexecute "The Godfather" I/O here as it's the - * responsibility of the caller to wait on him. + * responsibility of the caller to wait on it. */ if (!(pio->io_flags & ZIO_FLAG_GODFATHER)) { pio->io_queued_timestamp = gethrtime(); diff --git a/usr/src/uts/common/inet/ip/ip.c b/usr/src/uts/common/inet/ip/ip.c index 0d11362dd1..e5708d0b97 100644 --- a/usr/src/uts/common/inet/ip/ip.c +++ b/usr/src/uts/common/inet/ip/ip.c @@ -24,6 +24,7 @@ * Copyright (c) 1990 Mentat Inc. * Copyright (c) 2012 Joyent, Inc. All rights reserved. * Copyright (c) 2017 OmniTI Computer Consulting, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/types.h> @@ -10567,7 +10568,7 @@ ip_snmp_get_mib2_ip_route_media(queue_t *q, mblk_t *mpctl, int level, /* * make copies of the original message - * - mp2ctl is returned unchanged to the caller for his use + * - mp2ctl is returned unchanged to the caller for its use * - mpctl is sent upstream as ipRouteEntryTable * - mp3ctl is sent upstream as ipNetToMediaEntryTable * - mp4ctl is sent upstream as ipRouteAttributeTable @@ -10652,7 +10653,7 @@ ip_snmp_get_mib2_ip6_route_media(queue_t *q, mblk_t *mpctl, int level, /* * make copies of the original message - * - mp2ctl is returned unchanged to the caller for his use + * - mp2ctl is returned unchanged to the caller for its use * - mpctl is sent upstream as ipv6RouteEntryTable * - mp3ctl is sent upstream as ipv6NetToMediaEntryTable * - mp4ctl is sent upstream as ipv6RouteAttributeTable diff --git a/usr/src/uts/common/inet/ip/spd.c b/usr/src/uts/common/inet/ip/spd.c index 1f984c3651..a9493785cd 100644 --- a/usr/src/uts/common/inet/ip/spd.c +++ b/usr/src/uts/common/inet/ip/spd.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. */ /* @@ -5376,7 +5377,7 @@ ipsec_tun_outbound(mblk_t *mp, iptun_t *iptun, ipha_t *inner_ipv4, * NOTE2: "negotiate transport" tunnels should match ALL * inbound packets, but we do not uncomment the ASSERT() * below because if/when we open PF_POLICY, a user can - * shoot him/her-self in the foot with a 0 priority. + * shoot themself in the foot with a 0 priority. */ /* ASSERT(itp->itp_flags & ITPF_P_TUNNEL); */ diff --git a/usr/src/uts/common/inet/ipnet/ipnet.c b/usr/src/uts/common/inet/ipnet/ipnet.c index 2f53a48d80..16cd9e94ba 100644 --- a/usr/src/uts/common/inet/ipnet/ipnet.c +++ b/usr/src/uts/common/inet/ipnet/ipnet.c @@ -22,6 +22,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -1974,7 +1975,7 @@ ipobs_register_hook(netstack_t *ns, pfv_t func) VERIFY(hook != NULL); /* - * To register multiple hooks with he same callback function, + * To register multiple hooks with the same callback function, * a unique name is needed. */ (void) snprintf(name, sizeof (name), "ipobserve_%p", (void *)hook); diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c index fba7125690..c3bbd6a0d6 100644 --- a/usr/src/uts/common/inet/tcp/tcp.c +++ b/usr/src/uts/common/inet/tcp/tcp.c @@ -1258,7 +1258,7 @@ tcp_closei_local(tcp_t *tcp) /* * If we are an eager connection hanging off a listener that - * hasn't formally accepted the connection yet, get off his + * hasn't formally accepted the connection yet, get off its * list and blow off any data that we have accumulated. */ if (tcp->tcp_listener != NULL) { diff --git a/usr/src/uts/common/inet/tcp/tcp_bind.c b/usr/src/uts/common/inet/tcp/tcp_bind.c index c6df39b91e..72093af2f2 100644 --- a/usr/src/uts/common/inet/tcp/tcp_bind.c +++ b/usr/src/uts/common/inet/tcp/tcp_bind.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/types.h> @@ -351,7 +352,7 @@ tcp_bind_select_lport(tcp_t *tcp, in_port_t *requested_port_ptr, /* * If the user went through one of the RPC interfaces to create - * this socket and RPC is MLP in this zone, then give him an + * this socket and RPC is MLP in this zone, then give them an * anonymous MLP. */ if (connp->conn_anon_mlp && is_system_labeled()) { diff --git a/usr/src/uts/common/inet/tcp/tcp_input.c b/usr/src/uts/common/inet/tcp/tcp_input.c index 6eab136ee5..37e4d72745 100644 --- a/usr/src/uts/common/inet/tcp/tcp_input.c +++ b/usr/src/uts/common/inet/tcp/tcp_input.c @@ -1062,7 +1062,7 @@ tcp_eager_cleanup(tcp_t *listener, boolean_t q0_only) /* * If we are an eager connection hanging off a listener that hasn't - * formally accepted the connection yet, get off his list and blow off + * formally accepted the connection yet, get off its list and blow off * any data that we have accumulated. */ void diff --git a/usr/src/uts/common/inet/tcp/tcp_output.c b/usr/src/uts/common/inet/tcp/tcp_output.c index 115842e5e1..fedff0b962 100644 --- a/usr/src/uts/common/inet/tcp/tcp_output.c +++ b/usr/src/uts/common/inet/tcp/tcp_output.c @@ -1421,7 +1421,7 @@ tcp_output_urgent(void *arg, mblk_t *mp, void *arg2, ip_recv_attr_t *dummy) } /* - * Called by streams close routine via squeues when our client blows off her + * Called by streams close routine via squeues when our client blows off its * descriptor, we take this to mean: "close the stream state NOW, close the tcp * connection politely" When SO_LINGER is set (with a non-zero linger time and * it is not a nonblocking socket) then this routine sleeps until the FIN is 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. * diff --git a/usr/src/uts/common/klm/nlm_service.c b/usr/src/uts/common/klm/nlm_service.c index 7742198533..dceabaf53f 100644 --- a/usr/src/uts/common/klm/nlm_service.c +++ b/usr/src/uts/common/klm/nlm_service.c @@ -26,7 +26,7 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2012, 2016 by Delphix. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright 2014 Joyent, Inc. All rights reserved. */ @@ -704,7 +704,7 @@ nlm_block(nlm4_lockargs *lockargs, * Sleeping lock request with given fl is already * registered by someone else. This means that * some other thread is handling the request, let - * him to do its work. + * it do its work. */ ASSERT(error == EEXIST); return; diff --git a/usr/src/uts/common/netinet/tcp_timer.h b/usr/src/uts/common/netinet/tcp_timer.h index e19bb3ce85..d884b79fcf 100644 --- a/usr/src/uts/common/netinet/tcp_timer.h +++ b/usr/src/uts/common/netinet/tcp_timer.h @@ -1,6 +1,7 @@ /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. * * Redistribution and use in source and binary forms are permitted * provided that the above copyright notice and this paragraph are @@ -51,7 +52,7 @@ extern "C" { * and the window is too small to bother sending anything, then we start * the TCPT_PERSIST timer. When it expires, if the window is nonzero, * we go to transmit state. Otherwise, at intervals send a single byte - * into the peer's window to force him to update our window information. + * into the peer's window to force it to update our window information. * We do this at most as often as TCPT_PERSMIN time intervals, * but no more frequently than the current estimate of round-trip * packet time. The TCPT_PERSIST timer is cleared whenever we receive diff --git a/usr/src/uts/common/os/bio.c b/usr/src/uts/common/os/bio.c index 8350d5f2f9..81d26a4777 100644 --- a/usr/src/uts/common/os/bio.c +++ b/usr/src/uts/common/os/bio.c @@ -728,7 +728,7 @@ loop: /* * Come here in case of an internal error. At this point we couldn't - * get a buffer, but he have to return one. Hence we allocate some + * get a buffer, but we have to return one. Hence we allocate some * kind of error reply buffer on the fly. This buffer is marked as * B_NOCACHE | B_AGE | B_ERROR | B_DONE to assure the following: * - B_ERROR will indicate error to the caller. diff --git a/usr/src/uts/common/os/callout.c b/usr/src/uts/common/os/callout.c index 6c2fbd071e..66f17a3820 100644 --- a/usr/src/uts/common/os/callout.c +++ b/usr/src/uts/common/os/callout.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/callo.h> @@ -853,7 +854,7 @@ callout_heap_delete(callout_table_t *ct) * scanning the heap anyway. * * If the root gets changed and/or callout lists are expired, return the - * new expiration to the caller so he can reprogram the cyclic accordingly. + * new expiration to the caller so it can reprogram the cyclic accordingly. */ static hrtime_t callout_heap_process(callout_table_t *ct, hrtime_t delta, int timechange) diff --git a/usr/src/uts/common/os/core.c b/usr/src/uts/common/os/core.c index d4dddbe477..d5e272c16a 100644 --- a/usr/src/uts/common/os/core.c +++ b/usr/src/uts/common/os/core.c @@ -22,6 +22,7 @@ /* * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, Joyent Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -400,8 +401,8 @@ do_core(char *fp, int sig, enum core_types core_type, struct core_globals *cg) * For security reasons, we don't want root processes * to dump core through a symlink because that would * allow a malicious user to clobber any file on - * the system if s/he could convince a root process, - * perhaps a set-uid root process that s/he started, + * the system if they could convince a root process, + * perhaps a set-uid root process that they started, * to dump core in a directory writable by that user. * Similar security reasons apply to hard links. * For symmetry we do this unconditionally, not diff --git a/usr/src/uts/common/os/cpu.c b/usr/src/uts/common/os/cpu.c index 48439a90a5..87c0896814 100644 --- a/usr/src/uts/common/os/cpu.c +++ b/usr/src/uts/common/os/cpu.c @@ -879,7 +879,7 @@ cpu_pause_free(cpu_t *cp) ASSERT(MUTEX_HELD(&cpu_lock)); /* - * We have to get the thread and tell him to die. + * We have to get the thread and tell it to die. */ if ((t = cp->cpu_pause_thread) == NULL) { ASSERT(safe_list[cpun] == PAUSE_IDLE); diff --git a/usr/src/uts/common/os/devcfg.c b/usr/src/uts/common/os/devcfg.c index da412f4ea8..4a654317c9 100644 --- a/usr/src/uts/common/os/devcfg.c +++ b/usr/src/uts/common/os/devcfg.c @@ -23,6 +23,7 @@ * Copyright 2012 Nexenta Systems, Inc. All rights reserved. * Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/note.h> @@ -7698,7 +7699,7 @@ mt_config_children(struct mt_config_handle *hdl) brn = NULL; /* - * Hold the child that we are processing so he does not get + * Hold the child that we are processing so it does not get * removed. The corrisponding ndi_rele_devi() for children * that are not being skipped is done at the end of * mt_config_thread(). @@ -7797,7 +7798,7 @@ mt_config_driver(struct mt_config_handle *hdl) dip = devnamesp[par_major].dn_head; while (dip) { /* - * Hold the child that we are processing so he does not get + * Hold the child that we are processing so it does not get * removed. The corrisponding ndi_rele_devi() for children * that are not being skipped is done at the end of * mt_config_thread(). diff --git a/usr/src/uts/common/os/mutex.c b/usr/src/uts/common/os/mutex.c index a309ca89a3..e9806795d3 100644 --- a/usr/src/uts/common/os/mutex.c +++ b/usr/src/uts/common/os/mutex.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. */ /* @@ -149,7 +150,7 @@ * * In many ways (1) is the cleanest solution, but if a lock is moderately * contended it defeats the adaptive spin logic. If we make some other - * thread the owner, but he's not ONPROC yet, then all other threads on + * thread the owner, but it's not ONPROC yet, then all other threads on * other cpus that try to get the lock will conclude that the owner is * blocked, so they'll block too. And so on -- it escalates quickly, * with every thread taking the blocking path rather than the spin path. diff --git a/usr/src/uts/common/os/pghw.c b/usr/src/uts/common/os/pghw.c index 7b4b46f6ab..8e50b3cd36 100644 --- a/usr/src/uts/common/os/pghw.c +++ b/usr/src/uts/common/os/pghw.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/systm.h> @@ -577,8 +578,8 @@ pghw_cu_kstat_update(kstat_t *ksp, int rw) return (EACCES); /* - * Check whether the caller has priv_cpc_cpu privilege. If he doesn't, - * he will not get hardware utilization data. + * Check whether the caller has priv_cpc_cpu privilege. If it doesn't, + * it will not get hardware utilization data. */ has_cpc_privilege = (secpolicy_cpc_cpu(crgetcred()) == 0); diff --git a/usr/src/uts/common/os/policy.c b/usr/src/uts/common/os/policy.c index 06f7fb0f4f..c6e9a06ce2 100644 --- a/usr/src/uts/common/os/policy.c +++ b/usr/src/uts/common/os/policy.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/types.h> @@ -866,8 +867,8 @@ secpolicy_fs_unmount(cred_t *cr, struct vfs *vfsp) } /* - * Quotas are a resource, but if one has the ability to mount a filesystem, he - * should be able to modify quotas on it. + * Quotas are a resource, but if one has the ability to mount a filesystem, + * they should be able to modify quotas on it. */ int secpolicy_fs_quota(const cred_t *cr, const vfs_t *vfsp) diff --git a/usr/src/uts/common/os/strsubr.c b/usr/src/uts/common/os/strsubr.c index 1c39b5be88..87e0c5511d 100644 --- a/usr/src/uts/common/os/strsubr.c +++ b/usr/src/uts/common/os/strsubr.c @@ -25,6 +25,7 @@ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/types.h> @@ -6390,7 +6391,7 @@ drain_syncq(syncq_t *sq) sq->sq_svcflags &= ~SQ_SERVICE; /* - * If SQ_EXCL is set, someone else is processing this syncq - let him + * If SQ_EXCL is set, someone else is processing this syncq - let them * finish the job. */ if (flags & SQ_EXCL) { diff --git a/usr/src/uts/common/os/task.c b/usr/src/uts/common/os/task.c index b25825edd1..bafcfd45e0 100644 --- a/usr/src/uts/common/os/task.c +++ b/usr/src/uts/common/os/task.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/atomic.h> @@ -787,7 +788,7 @@ changeproj(proc_t *p, kproject_t *kpj, zone_t *zone, void *projbuf, oldkpj = ttoproj(t); /* - * Kick this thread so that he doesn't sit + * Kick this thread so that it doesn't sit * on a wrong wait queue. */ if (ISWAITING(t)) diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c index d966b5e72a..f241bfbc3a 100644 --- a/usr/src/uts/common/os/zone.c +++ b/usr/src/uts/common/os/zone.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2015, Joyent Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -6168,7 +6169,7 @@ zone_enter(zoneid_t zoneid) do { thread_lock(t); /* - * Kick this thread so that he doesn't sit + * Kick this thread so that it doesn't sit * on a wrong wait queue. */ if (ISWAITING(t)) @@ -6358,8 +6359,8 @@ zone_list(zoneid_t *zoneidlist, uint_t *numzones) /* * If user has allocated space for fewer entries than we found, then - * return only up to his limit. Either way, tell him exactly how many - * we found. + * return only up to their limit. Either way, tell them exactly how + * many we found. */ if (domi_nzones < user_nzones) user_nzones = domi_nzones; diff --git a/usr/src/uts/common/rpc/clnt_cots.c b/usr/src/uts/common/rpc/clnt_cots.c index cb8f337c69..2e64ab0922 100644 --- a/usr/src/uts/common/rpc/clnt_cots.c +++ b/usr/src/uts/common/rpc/clnt_cots.c @@ -21,6 +21,7 @@ /* * Copyright 2016 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -3613,7 +3614,7 @@ clnt_dispatch_notifyall(queue_t *q, int32_t msg_type, int32_t reason) e->call_reason = reason; e->call_notified = TRUE; /* - * Let the caller timeout, else he will retry + * Let the caller timeout, else it will retry * immediately. */ e->call_status = RPC_XPRTFAILED; diff --git a/usr/src/uts/common/smbsrv/ntifs.h b/usr/src/uts/common/smbsrv/ntifs.h index 4a9fdddbfd..79dcbf91da 100644 --- a/usr/src/uts/common/smbsrv/ntifs.h +++ b/usr/src/uts/common/smbsrv/ntifs.h @@ -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. */ #ifndef _SMBSRV_NTIFS_H @@ -439,7 +440,7 @@ typedef struct smb_acl { * Security descriptors provide protection for objects, for example * files and directories. It identifies the owner and primary group * (SIDs) and contains an access control list. When a user tries to - * access an object his SID is compared to the permissions in the + * access an object their SID is compared to the permissions in the * DACL to determine if access should be allowed or denied. Note that * this is a simplification because there are other factors, such as * default behavior and privileges to be taken into account (see also diff --git a/usr/src/uts/common/smbsrv/smb_share.h b/usr/src/uts/common/smbsrv/smb_share.h index 319be08801..cfb7551dec 100644 --- a/usr/src/uts/common/smbsrv/smb_share.h +++ b/usr/src/uts/common/smbsrv/smb_share.h @@ -22,6 +22,7 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #ifndef _SMB_SHARE_H @@ -181,7 +182,7 @@ extern "C" { #define SMB_SHARE_PRINT_LEN 6 /* * refcnt is currently only used for autohome. autohome needs a refcnt - * because a user can map his autohome share from more than one client + * because a user can map their autohome share from more than one client * at the same time and the share should only be removed when the last * one is disconnected */ diff --git a/usr/src/uts/common/sys/ddi_impldefs.h b/usr/src/uts/common/sys/ddi_impldefs.h index bfe2d855b6..96cd4708dd 100644 --- a/usr/src/uts/common/sys/ddi_impldefs.h +++ b/usr/src/uts/common/sys/ddi_impldefs.h @@ -21,6 +21,7 @@ /* * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #ifndef _SYS_DDI_IMPLDEFS_H @@ -354,7 +355,7 @@ struct dev_info { /* * Device state macros. * o All SET/CLR/DONE users must protect context with devi_lock. - * o DEVI_SET_DEVICE_ONLINE users must do his own DEVI_SET_REPORT. + * o DEVI_SET_DEVICE_ONLINE users must do their own DEVI_SET_REPORT. * o DEVI_SET_DEVICE_{DOWN|DEGRADED|UP} should only be used when !OFFLINE. * o DEVI_SET_DEVICE_UP clears DOWN and DEGRADED. */ diff --git a/usr/src/uts/common/sys/esunddi.h b/usr/src/uts/common/sys/esunddi.h index e2f860d520..8bb4729ae4 100644 --- a/usr/src/uts/common/sys/esunddi.h +++ b/usr/src/uts/common/sys/esunddi.h @@ -21,6 +21,7 @@ /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #ifndef _SYS_ESUNDDI_H @@ -183,7 +184,7 @@ e_ddi_hold_devi(dev_info_t *); /* * Return the reference count on a devinfo node. The caller can determine, - * with knowledge of his own holds, if the devinfo node is still in use. + * with knowledge of its own holds, if the devinfo node is still in use. */ int e_ddi_devi_holdcnt(dev_info_t *dip); diff --git a/usr/src/uts/common/syscall/lwpsys.c b/usr/src/uts/common/syscall/lwpsys.c index 40f242c7b4..4c5b280677 100644 --- a/usr/src/uts/common/syscall/lwpsys.c +++ b/usr/src/uts/common/syscall/lwpsys.c @@ -22,6 +22,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -300,7 +301,7 @@ lwp_wait(id_t lwpid, id_t *departed) error = EDEADLK; break; } - /* who is he waiting for? */ + /* who are they waiting for? */ if ((tid = t->t_waitfor) == -1) break; if (tid == 0) { diff --git a/usr/src/uts/common/syscall/poll.c b/usr/src/uts/common/syscall/poll.c index cc125f127a..6ffef9e3ec 100644 --- a/usr/src/uts/common/syscall/poll.c +++ b/usr/src/uts/common/syscall/poll.c @@ -28,7 +28,7 @@ /* All Rights Reserved */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2012, 2016 by Delphix. All rights reserved. * Copyright 2015, Joyent, Inc. */ @@ -370,8 +370,8 @@ poll_common(pollfd_t *fds, nfds_t nfds, timespec_t *tsp, k_sigset_t *ksetp) } /* - * Check to see if this guy just wants to use poll() as a timeout. - * If yes then bypass all the other stuff and make him sleep. + * Check to see if this one just wants to use poll() as a timeout. + * If yes then bypass all the other stuff and make it sleep. */ if (nfds == 0) { /* diff --git a/usr/src/uts/common/vm/page_retire.c b/usr/src/uts/common/vm/page_retire.c index 2bebe9a3f9..76be970a45 100644 --- a/usr/src/uts/common/vm/page_retire.c +++ b/usr/src/uts/common/vm/page_retire.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. */ /* @@ -690,7 +691,7 @@ page_retire_transient_ue(page_t *pp) ASSERT(!hat_page_is_mapped(pp)); /* - * If this page is a repeat offender, retire him under the + * If this page is a repeat offender, retire it under the * "two strikes and you're out" rule. The caller is responsible * for scrubbing the page to try to clear the error. */ diff --git a/usr/src/uts/common/vm/seg_spt.c b/usr/src/uts/common/vm/seg_spt.c index db23fc6c75..6a4389676c 100644 --- a/usr/src/uts/common/vm/seg_spt.c +++ b/usr/src/uts/common/vm/seg_spt.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, Joyent, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sys/param.h> @@ -1112,7 +1113,7 @@ segspt_dismpagelock(struct seg *seg, caddr_t addr, size_t len, } /* * We can now drop the sptd->spt_lock since the ppa[] - * exists and he have incremented pacachecnt. + * exists and we have incremented pacachecnt. */ mutex_exit(&sptd->spt_lock); @@ -1374,7 +1375,7 @@ segspt_shmpagelock(struct seg *seg, caddr_t addr, size_t len, /* * We can now drop the sptd->spt_lock since the ppa[] - * exists and he have incremented pacachecnt. + * exists and we have incremented pacachecnt. */ mutex_exit(&sptd->spt_lock); |