svn commit: r331385 - in stable/11/sys/cddl/contrib/opensolaris: common/nvpair uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Thu Mar 22 23:43:48 2018
New Revision: 331385
URL: https://svnweb.freebsd.org/changeset/base/331385

Log:
  MFC r329628: MFC r316910: 7812 Remove gender specific language
  
  illumos/illumos-gate at 48bbca816818409505a6e214d0911fda44e622e3
  https://github.com/illumos/illumos-gate/commit/48bbca816818409505a6e214d0911fda44e622e3
  
  https://www.illumos.org/issues/7812
    This change removes all gendered language that did not refer specifically
    to an individual person or pet. The convention taken was to use
    variations on "they" when referring to users and/or human beings, while
    using "it" when referring to code, functions, and/or libraries.
    Additionally, we took the liberty to fix up any whitespace issues that
    were found in any files that were already being modified.
  
  Reviewed by: Matt Ahrens <mahrens at delphix.com>
  Reviewed by: Prakash Surya <prakash.surya at delphix.com>
  Reviewed by: Steve Gonczi <steve.gonczi at delphix.com>
  Reviewed by: Chris Williamson <chris.williamson at delphix.com>
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Igor Kozhukhov <igor at dilos.org>
  Reviewed by: Dan McDonald <danmcd at omniti.com>
  Reviewed by: Robert Mustacchi <rm at joyent.com>
  Approved by: Richard Lowe <richlowe at richlowe.net>
  Author: Daniel Hoffman <dj.hoffman at delphix.com>

Modified:
  stable/11/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c	Thu Mar 22 23:43:05 2018	(r331384)
+++ stable/11/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c	Thu Mar 22 23:43:48 2018	(r331385)
@@ -2379,7 +2379,7 @@ nvlist_xpack(nvlist_t *nvl, char **bufp, size_t *bufle
 	 * 1. The nvlist has fixed allocator properties.
 	 *    All other nvlist routines (like nvlist_add_*, ...) use
 	 *    these properties.
-	 * 2. When using nvlist_pack() the user can specify his own
+	 * 2. When using nvlist_pack() the user can specify their own
 	 *    allocator properties (e.g. by using KM_NOSLEEP).
 	 *
 	 * We use the user specified properties (2). A clearer solution

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c	Thu Mar 22 23:43:05 2018	(r331384)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c	Thu Mar 22 23:43:48 2018	(r331385)
@@ -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.
  */
 

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Thu Mar 22 23:43:05 2018	(r331384)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Thu Mar 22 23:43:48 2018	(r331385)
@@ -1812,7 +1812,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();