From d5884c3453c5de5892eaae672c5186ed02846113 Mon Sep 17 00:00:00 2001
From: GeLiXin <ge.lixin@zte.com.cn>
Date: Mon, 8 Aug 2016 16:00:08 +0800
Subject: [PATCH] Fix indefinite article

The indefinite article before nvlist should be "an", not "a".

We have 27 "an nvlist" and 7 "a nvlist" in our comment, they should
stay the same as we are such a strict filesystem.

Signed-off-by: GeLiXin <ge.lixin@zte.com.cn>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4941
---
 include/sys/fs/zfs.h          | 2 +-
 lib/libzfs/libzfs_config.c    | 2 +-
 lib/libzfs_core/libzfs_core.c | 4 ++--
 module/nvpair/nvpair.c        | 2 +-
 module/zfs/fm.c               | 2 +-
 module/zfs/spa_history.c      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
index b25d3016a..9d3008934 100644
--- a/include/sys/fs/zfs.h
+++ b/include/sys/fs/zfs.h
@@ -834,7 +834,7 @@ typedef struct vdev_stat {
  *
  * These are stats which aren't included in the original iostat output.  For
  * convenience, they are grouped together in vdev_stat_ex, although each stat
- * is individually exported as a nvlist.
+ * is individually exported as an nvlist.
  */
 typedef struct vdev_stat_ex {
 	/* Number of ZIOs issued to disk and waiting to finish */
diff --git a/lib/libzfs/libzfs_config.c b/lib/libzfs/libzfs_config.c
index 6ecfe98ff..4585a2b77 100644
--- a/lib/libzfs/libzfs_config.c
+++ b/lib/libzfs/libzfs_config.c
@@ -212,7 +212,7 @@ namespace_reload(libzfs_handle_t *hdl)
 }
 
 /*
- * Retrieve the configuration for the given pool.  The configuration is a nvlist
+ * Retrieve the configuration for the given pool. The configuration is an nvlist
  * describing the vdevs, as well as the statistics associated with each one.
  */
 nvlist_t *
diff --git a/lib/libzfs_core/libzfs_core.c b/lib/libzfs_core/libzfs_core.c
index 0359e4284..74370f401 100644
--- a/lib/libzfs_core/libzfs_core.c
+++ b/lib/libzfs_core/libzfs_core.c
@@ -391,7 +391,7 @@ lzc_hold(nvlist_t *holds, int cleanup_fd, nvlist_t **errlist)
  *
  * The keys in the nvlist are snapshot names.
  * The snapshots must all be in the same pool.
- * The value is a nvlist whose keys are the holds to remove.
+ * The value is an nvlist whose keys are the holds to remove.
  *
  * Holds which failed to release because they didn't exist will have an entry
  * added to errlist, but will not cause an overall failure.
@@ -424,7 +424,7 @@ lzc_release(nvlist_t *holds, nvlist_t **errlist)
 /*
  * Retrieve list of user holds on the specified snapshot.
  *
- * On success, *holdsp will be set to a nvlist which the caller must free.
+ * On success, *holdsp will be set to an nvlist which the caller must free.
  * The keys are the names of the holds, and the value is the creation time
  * of the hold (uint64) in seconds since the epoch.
  */
diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c
index 1eca0feea..bfd21314e 100644
--- a/module/nvpair/nvpair.c
+++ b/module/nvpair/nvpair.c
@@ -2022,7 +2022,7 @@ typedef struct {
 /*
  * nvs operations are:
  *   - nvs_nvlist
- *     encoding / decoding of a nvlist header (nvlist_t)
+ *     encoding / decoding of an nvlist header (nvlist_t)
  *     calculates the size used for header and end detection
  *
  *   - nvs_nvpair
diff --git a/module/zfs/fm.c b/module/zfs/fm.c
index 4de901ed0..d60c296c5 100644
--- a/module/zfs/fm.c
+++ b/module/zfs/fm.c
@@ -154,7 +154,7 @@ fm_printf(int depth, int c, int cols, const char *format, ...)
 }
 
 /*
- * Recursively print a nvlist in the specified column width and return the
+ * Recursively print an nvlist in the specified column width and return the
  * column we end up in.  This function is called recursively by fm_nvprint(),
  * below.  We generically format the entire nvpair using hexadecimal
  * integers and strings, and elide any integer arrays.  Arrays are basically
diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c
index cf6fc224a..4ae74c284 100644
--- a/module/zfs/spa_history.c
+++ b/module/zfs/spa_history.c
@@ -46,7 +46,7 @@
  * The history log is stored as a dmu object containing
  * <packed record length, record nvlist> tuples.
  *
- * Where "record nvlist" is a nvlist containing uint64_ts and strings, and
+ * Where "record nvlist" is an nvlist containing uint64_ts and strings, and
  * "packed record length" is the packed length of the "record nvlist" stored
  * as a little endian uint64_t.
  *