diff options
author | Andriy Gapon <avg@FreeBSD.org> | 2017-04-14 18:22:42 +0000 |
---|---|---|
committer | Andriy Gapon <avg@FreeBSD.org> | 2017-04-14 18:22:42 +0000 |
commit | d3f85b54a4019f9dbca3ea4d28a7bf51131a7353 (patch) | |
tree | 3af8ef0dd23fe7e0cbcf704bb3126668cb181a7d | |
parent | b6187af16bbb85ea70265f2895e24d82e479ac26 (diff) |
Notes
-rw-r--r-- | common/nvpair/nvpair.c | 2 | ||||
-rw-r--r-- | uts/common/fs/zfs/zfs_dir.c | 6 | ||||
-rw-r--r-- | uts/common/fs/zfs/zio.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common/nvpair/nvpair.c b/common/nvpair/nvpair.c index 691de5d61b69..8c41d42e6ca0 100644 --- a/common/nvpair/nvpair.c +++ b/common/nvpair/nvpair.c @@ -2375,7 +2375,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/uts/common/fs/zfs/zfs_dir.c b/uts/common/fs/zfs/zfs_dir.c index 46f3903eedfb..e1f27cc68b97 100644 --- a/uts/common/fs/zfs/zfs_dir.c +++ b/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/uts/common/fs/zfs/zio.c b/uts/common/fs/zfs/zio.c index 652c17afcd90..cca1daa81ee7 100644 --- a/uts/common/fs/zfs/zio.c +++ b/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(); |