From 9e2c3bb4b977bb6c5091b63bf6a736466ba25d1a Mon Sep 17 00:00:00 2001 From: Daniel Hoffman Date: Fri, 17 Feb 2017 11:48:20 -0800 Subject: [PATCH] OpenZFS 7812 - Remove gender specific language Authored by: Daniel Hoffman Reviewed by: Matt Ahrens Reviewed by: Prakash Surya Reviewed by: Steve Gonczi Reviewed by: Chris Williamson Reviewed by: George Wilson Reviewed by: Igor Kozhukhov Reviewed by: Dan McDonald Reviewed by: Robert Mustacchi Reviewed-by: Giuseppe Di Natale Ported-by: George Melikov 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. OpenZFS-issue: https://www.illumos.org/issues/7812 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/ad626db Closes #5822 --- module/nvpair/nvpair.c | 2 +- module/zfs/zfs_dir.c | 6 +++--- module/zfs/zio.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c index 14b196d96..2e3820981 100644 --- a/module/nvpair/nvpair.c +++ b/module/nvpair/nvpair.c @@ -2395,7 +2395,7 @@ nvlist_xpack(nvlist_t *nvl, char **bufp, size_t *buflen, int encoding, * 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 diff --git a/module/zfs/zfs_dir.c b/module/zfs/zfs_dir.c index c5643c43a..ad159b1b6 100644 --- a/module/zfs/zfs_dir.c +++ b/module/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. */ @@ -305,8 +305,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/module/zfs/zio.c b/module/zfs/zio.c index 003940795..8a3b3066a 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -1827,7 +1827,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();