[illumos-gate merge]

commit a76660dbabd3d3b161bdead081ce275af6966d2e
    7083 create_ramdisk.sh need not check for inuse devices
commit 3f85b2aed8a5768f4c20db925cdf8fc072472037
    7036 zvol_swap_004_pos test failed
commit 10e67aa0db0823d5464aafdd681f3c966155c68e
    7082 bptree_iterate() passes wrong args to zfs_dbgmsg()
commit 2404c9e6b54f427b32dd0a2d46940d6a4c5299bc
    7062 Connections remain in TIME_WAIT too long
    7061 local TCP connections should be expediently purged from TIME_WAIT
commit 9adfa60d484ce2435f5af77cc99dcd4e692b6660
    6314 buffer overflow in dsl_dataset_name
commit 0c779ad424a92a84d1e07d47cab7f8009189202b
    7054 dmu_tx_hold_t should use refcount_t to track space

18 files changed, 173 insertions, 152 deletions

diff --git a/usr/src/cmd/beadm/beadm.c b/usr/src/cmd/beadm/beadm.c
index 1341c3ad6d..dc4aab5b59 100644
--- a/usr/src/cmd/beadm/beadm.c
+++ b/usr/src/cmd/beadm/beadm.c
@@ -21,12 +21,10 @@
 
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- */
-
-/*
  * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
  * Copyright 2015 Toomas Soome <tsoome@me.com>
  * Copyright 2015 Gary Mills
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -288,7 +286,7 @@ count_widths(enum be_fmt be_fmt, struct hdr_info *hdr, be_node_list_t *be_nodes)
 		len[i] = hdr->cols[i].width;
 
 	for (cur_be = be_nodes; cur_be != NULL; cur_be = cur_be->be_next_node) {
-		char name[ZFS_MAXNAMELEN+1];
+		char name[ZFS_MAX_DATASET_NAME_LEN + 1];
 		const char *be_name = cur_be->be_node_name;
 		const char *root_ds = cur_be->be_root_ds;
 		char *pos;
@@ -432,7 +430,7 @@ print_be_snapshots(be_node_list_t *be, struct hdr_info *hdr, boolean_t parsable)
 
 	for (snap = be->be_node_snapshots; snap != NULL;
 	    snap = snap->be_next_snapshot) {
-		char name[ZFS_MAXNAMELEN+1];
+		char name[ZFS_MAX_DATASET_NAME_LEN + 1];
 		const char *datetime_fmt = "%F %R";
 		const char *be_name = be->be_node_name;
 		const char *root_ds = be->be_root_ds;
diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c
index c520301579..6e653470f1 100644
--- a/usr/src/cmd/boot/bootadm/bootadm.c
+++ b/usr/src/cmd/boot/bootadm/bootadm.c
@@ -20,11 +20,12 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012 Milan Jurik. All rights reserved.
  */
 
 /*
+ * Copyright 2012 Milan Jurik. All rights reserved.
  * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -3228,7 +3229,7 @@ is_be(char *root)
 	be_node_list_t	*be_nodes = NULL;
 	be_node_list_t	*cur_be;
 	boolean_t	be_exist = B_FALSE;
-	char		ds_path[ZFS_MAXNAMELEN];
+	char		ds_path[ZFS_MAX_DATASET_NAME_LEN];
 
 	if (!is_zfs(root))
 		return (B_FALSE);
@@ -4972,12 +4973,12 @@ list_entry(menu_t *mp, char *menu_path, char *opt)
 
 int
 add_boot_entry(menu_t *mp,
-	char *title,
-	char *findroot,
-	char *kernel,
-	char *mod_kernel,
-	char *module,
-	char *bootfs)
+    char *title,
+    char *findroot,
+    char *kernel,
+    char *mod_kernel,
+    char *module,
+    char *bootfs)
 {
 	int		lineNum;
 	int		entryNum;
diff --git a/usr/src/cmd/boot/scripts/create_ramdisk.ksh b/usr/src/cmd/boot/scripts/create_ramdisk.ksh
index f7e15b4bdf..abcad516a0 100644
--- a/usr/src/cmd/boot/scripts/create_ramdisk.ksh
+++ b/usr/src/cmd/boot/scripts/create_ramdisk.ksh
@@ -23,6 +23,10 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
+#
+# Copyright (c) 2014 by Delphix. All rights reserved.
+#
+
 format=ufs
 ALT_ROOT=
 EXTRACT_ARGS=
@@ -255,7 +259,7 @@ function create_ufs
 		list="$list32"
 	fi
 
-	newfs $lofidev < /dev/null 2> /dev/null
+	NOINUSE_CHECK=1 newfs $lofidev < /dev/null 2> /dev/null
 	mkdir "$rdmnt"
 	mount -F mntfs mnttab /etc/mnttab > /dev/null 2>&1
 	mount -F ufs -o nologging $lofidev "$rdmnt"
diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c
index 3b57e02c64..8464619a68 100644
--- a/usr/src/cmd/halt/halt.c
+++ b/usr/src/cmd/halt/halt.c
@@ -25,6 +25,7 @@
  */
 /*
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -720,7 +721,7 @@ validate_zfs_err_out:
  */
 static int
 get_zfs_bootfs_arg(const char *arg, const char ** fpth, int *is_zfs,
-		char *bootfs_arg)
+    char *bootfs_arg)
 {
 	zfs_handle_t *zhp = NULL;
 	zpool_handle_t *zpoolp = NULL;
@@ -728,8 +729,8 @@ get_zfs_bootfs_arg(const char *arg, const char ** fpth, int *is_zfs,
 	struct mnttab mnt;
 	char *poolname = NULL;
 	char physpath[MAXPATHLEN];
-	char mntsp[ZPOOL_MAXNAMELEN];
-	char bootfs[ZPOOL_MAXNAMELEN];
+	char mntsp[ZFS_MAX_DATASET_NAME_LEN];
+	char bootfs[ZFS_MAX_DATASET_NAME_LEN];
 	int rc = 0;
 	size_t mntlen = 0;
 	size_t msz;
diff --git a/usr/src/cmd/mdb/common/modules/zfs/zfs.c b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
index 2dc45f778b..697349b020 100644
--- a/usr/src/cmd/mdb/common/modules/zfs/zfs.c
+++ b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
@@ -230,7 +230,7 @@ mdb_dsl_dir_name(uintptr_t addr, char *buf)
 	static int gotid;
 	static mdb_ctf_id_t dd_id;
 	uintptr_t dd_parent;
-	char dd_myname[MAXNAMELEN];
+	char dd_myname[ZFS_MAX_DATASET_NAME_LEN];
 
 	if (!gotid) {
 		if (mdb_ctf_lookup_by_name(ZFS_STRUCT "dsl_dir",
@@ -265,7 +265,7 @@ objset_name(uintptr_t addr, char *buf)
 	static int gotid;
 	static mdb_ctf_id_t os_id, ds_id;
 	uintptr_t os_dsl_dataset;
-	char ds_snapname[MAXNAMELEN];
+	char ds_snapname[ZFS_MAX_DATASET_NAME_LEN];
 	uintptr_t ds_dir;
 
 	buf[0] = '\0';
@@ -466,7 +466,7 @@ dbuf(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	mdb_dmu_buf_impl_t db;
 	char objectname[32];
 	char blkidname[32];
-	char path[MAXNAMELEN];
+	char path[ZFS_MAX_DATASET_NAME_LEN];
 	int ptr_width = (int)(sizeof (void *)) * 2;
 
 	if (DCMD_HDRSPEC(flags))
@@ -725,7 +725,7 @@ dbufs_cb(uintptr_t addr, const void *unknown, void *arg)
 	dmu_buf_t db;
 	uint8_t level;
 	uint64_t blkid;
-	char osname[MAXNAMELEN];
+	char osname[ZFS_MAX_DATASET_NAME_LEN];
 
 	if (GETMEMBID(addr, &data->id, db_objset, objset) ||
 	    GETMEMBID(addr, &data->id, db, db) ||
@@ -1079,7 +1079,7 @@ arc_print(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 typedef struct mdb_spa_print {
 	pool_state_t spa_state;
-	char spa_name[MAXNAMELEN];
+	char spa_name[ZFS_MAX_DATASET_NAME_LEN];
 } mdb_spa_print_t;
 
 /*
diff --git a/usr/src/cmd/ndmpd/include/tlm.h b/usr/src/cmd/ndmpd/include/tlm.h
index 799cf1e277..f382d2eca3 100644
--- a/usr/src/cmd/ndmpd/include/tlm.h
+++ b/usr/src/cmd/ndmpd/include/tlm.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -475,7 +476,7 @@ typedef struct ndmp_metadata_property {
 } ndmp_metadata_property_t;
 
 typedef struct ndmp_metadata_property_ext {
-	char mp_name[ZFS_MAXNAMELEN];
+	char mp_name[ZFS_MAX_DATASET_NAME_LEN];
 	char mp_value[ZFS_MAXPROPLEN];
 	char mp_source[ZFS_MAXPROPLEN];
 } ndmp_metadata_property_ext_t;
@@ -498,7 +499,7 @@ typedef struct ndmp_metadata_header {
 /* Extended metadata format */
 typedef struct ndmp_metadata_header_ext {
 	ndmp_metadata_top_header_t nh_hdr;
-	char nh_dataset[ZFS_MAXNAMELEN];
+	char nh_dataset[ZFS_MAX_DATASET_NAME_LEN];
 	int32_t nh_total_bytes;
 	int32_t nh_major;
 	int32_t nh_minor;
diff --git a/usr/src/cmd/ndmpd/ndmp/ndmpd.h b/usr/src/cmd/ndmpd/ndmp/ndmpd.h
index 3a39a04a7d..4f9fcd9a09 100644
--- a/usr/src/cmd/ndmpd/ndmp/ndmpd.h
+++ b/usr/src/cmd/ndmpd/ndmp/ndmpd.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -456,9 +457,9 @@ typedef struct {
 
 typedef struct ndmpd_zfs_args {
 	zfs_type_t nz_type;			/* type of ZFS dataset */
-	char nz_dataset[ZFS_MAXNAMELEN];	/* dataset name */
-	char nz_snapname[ZFS_MAXNAMELEN];	/* snapname (following '@') */
-	char nz_fromsnap[ZFS_MAXNAMELEN];	/* snap of L-1 bkup */
+	char nz_dataset[ZFS_MAX_DATASET_NAME_LEN]; /* dataset name */
+	char nz_snapname[ZFS_MAX_DATASET_NAME_LEN]; /* snapname (following @) */
+	char nz_fromsnap[ZFS_MAX_DATASET_NAME_LEN]; /* snap of L-1 bkup */
 	char nz_snapprop[ZFS_MAXPROPLEN];	/* contents of snap incr prop */
 	boolean_t nz_ndmpd_snap;		/* ndmpd-generated snap? */
 
diff --git a/usr/src/cmd/ndmpd/ndmp/ndmpd_chkpnt.c b/usr/src/cmd/ndmpd/ndmp/ndmpd_chkpnt.c
index ea391590db..ac086b7cf8 100644
--- a/usr/src/cmd/ndmpd/ndmp/ndmpd_chkpnt.c
+++ b/usr/src/cmd/ndmpd/ndmp/ndmpd_chkpnt.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  * Copyright (c) 2016 Martin Matuska. All rights reserved.
  */
@@ -103,7 +103,7 @@ ndmp_has_backup_snapshot(char *volname, char *jobname)
 {
 	zfs_handle_t *zhp;
 	snap_param_t snp;
-	char chname[ZFS_MAXNAMELEN];
+	char chname[ZFS_MAX_DATASET_NAME_LEN];
 
 	(void) mutex_lock(&zlib_mtx);
 	if ((zhp = zfs_open(zlibh, volname, ZFS_TYPE_DATASET)) == 0) {
@@ -113,7 +113,7 @@ ndmp_has_backup_snapshot(char *volname, char *jobname)
 	}
 
 	snp.snp_found = 0;
-	(void) snprintf(chname, ZFS_MAXNAMELEN, "@%s", jobname);
+	(void) snprintf(chname, ZFS_MAX_DATASET_NAME_LEN, "@%s", jobname);
 	snp.snp_name = chname;
 
 	(void) zfs_iter_snapshots(zhp, B_FALSE, ndmp_has_backup, &snp);
@@ -140,7 +140,7 @@ ndmp_has_backup_snapshot(char *volname, char *jobname)
 int
 ndmp_create_snapshot(char *vol_name, char *jname)
 {
-	char vol[ZFS_MAXNAMELEN];
+	char vol[ZFS_MAX_DATASET_NAME_LEN];
 
 	if (vol_name == 0 ||
 	    get_zfsvolname(vol, sizeof (vol), vol_name) == -1)
@@ -174,7 +174,7 @@ ndmp_create_snapshot(char *vol_name, char *jname)
 int
 ndmp_remove_snapshot(char *vol_name, char *jname)
 {
-	char vol[ZFS_MAXNAMELEN];
+	char vol[ZFS_MAX_DATASET_NAME_LEN];
 
 	if (vol_name == 0 ||
 	    get_zfsvolname(vol, sizeof (vol), vol_name) == -1)
@@ -247,13 +247,14 @@ int
 snapshot_create(char *volname, char *jname, boolean_t recursive,
     boolean_t hold)
 {
-	char snapname[ZFS_MAXNAMELEN];
+	char snapname[ZFS_MAX_DATASET_NAME_LEN];
 	int rv;
 
 	if (!volname || !*volname)
 		return (-1);
 
-	(void) snprintf(snapname, ZFS_MAXNAMELEN, "%s@%s", volname, jname);
+	(void) snprintf(snapname, ZFS_MAX_DATASET_NAME_LEN,
+	    "%s@%s", volname, jname);
 
 	(void) mutex_lock(&zlib_mtx);
 	if ((rv = zfs_snapshot(zlibh, snapname, recursive, NULL))
@@ -287,7 +288,7 @@ int
 snapshot_destroy(char *volname, char *jname, boolean_t recursive,
     boolean_t hold, int *zfs_err)
 {
-	char snapname[ZFS_MAXNAMELEN];
+	char snapname[ZFS_MAX_DATASET_NAME_LEN];
 	zfs_handle_t *zhp;
 	zfs_type_t ztype;
 	char *namep;
@@ -303,8 +304,8 @@ snapshot_destroy(char *volname, char *jname, boolean_t recursive,
 		ztype = ZFS_TYPE_VOLUME | ZFS_TYPE_FILESYSTEM;
 		namep = volname;
 	} else {
-		(void) snprintf(snapname, ZFS_MAXNAMELEN, "%s@%s", volname,
-		    jname);
+		(void) snprintf(snapname, ZFS_MAX_DATASET_NAME_LEN,
+		    "%s@%s", volname, jname);
 		namep = snapname;
 		ztype = ZFS_TYPE_SNAPSHOT;
 	}
diff --git a/usr/src/cmd/ndmpd/ndmp/ndmpd_dtime.c b/usr/src/cmd/ndmpd/ndmp/ndmpd_dtime.c
index 132f88a2da..bf197dd9b7 100644
--- a/usr/src/cmd/ndmpd/ndmp/ndmpd_dtime.c
+++ b/usr/src/cmd/ndmpd/ndmp/ndmpd_dtime.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -832,7 +833,7 @@ ndmpd_get_dumptime(char *path, int *level, time_t *ddate)
 {
 	int i;
 	dumpdates_t ddhead, *ddp, *save;
-	char vol[ZFS_MAXNAMELEN];
+	char vol[ZFS_MAX_DATASET_NAME_LEN];
 	nvlist_t *userprops;
 	zfs_handle_t *zhp;
 	nvlist_t *propval = NULL;
@@ -956,7 +957,7 @@ ndmpd_get_dumptime(char *path, int *level, time_t *ddate)
 int
 ndmpd_put_dumptime(char *path, int level, time_t ddate)
 {
-	char vol[ZFS_MAXNAMELEN];
+	char vol[ZFS_MAX_DATASET_NAME_LEN];
 	zfs_handle_t *zhp;
 	char tbuf[64];
 	int rv;
@@ -993,7 +994,7 @@ ndmpd_put_dumptime(char *path, int level, time_t ddate)
 int
 ndmpd_append_dumptime(char *fname, char *path, int level, time_t ddate)
 {
-	char vol[ZFS_MAXNAMELEN];
+	char vol[ZFS_MAX_DATASET_NAME_LEN];
 	zfs_handle_t *zhp;
 	char tbuf[64];
 	int rv;
diff --git a/usr/src/cmd/ndmpd/ndmp/ndmpd_zfs.c b/usr/src/cmd/ndmpd/ndmp/ndmpd_zfs.c
index e37cfb68c4..c124794fc4 100644
--- a/usr/src/cmd/ndmpd/ndmp/ndmpd_zfs.c
+++ b/usr/src/cmd/ndmpd/ndmp/ndmpd_zfs.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -57,7 +57,7 @@
 
 typedef struct {
 	char nzs_findprop[ZFS_MAXPROPLEN]; /* prop substring to find */
-	char nzs_snapname[ZFS_MAXNAMELEN]; /* snap's name */
+	char nzs_snapname[ZFS_MAX_DATASET_NAME_LEN]; /* snap's name */
 	char nzs_snapprop[ZFS_MAXPROPLEN]; /* snap's prop value */
 	char nzs_snapskip[ZFS_MAXPROPLEN]; /* snap to skip */
 	uint32_t nzs_prop_major;	   /* property major version */
@@ -1071,13 +1071,14 @@ ndmpd_zfs_pre_restore(ndmpd_zfs_args_t *ndmpd_zfs_args)
 	ndmpd_session_t *session = (ndmpd_session_t *)
 	    (ndmpd_zfs_params->mp_daemon_cookie);
 	ndmp_context_t *nctxp = &ndmpd_zfs_args->nz_nctx;
-	char bkpath[ZFS_MAXNAMELEN];
+	char bkpath[ZFS_MAX_DATASET_NAME_LEN];
 	int err;
 
 	if (ndmp_pl == NULL || ndmp_pl->np_pre_restore == NULL)
 		return (0);
 
-	err = ndmpd_zfs_backup_getpath(ndmpd_zfs_args, bkpath, ZFS_MAXNAMELEN);
+	err = ndmpd_zfs_backup_getpath(ndmpd_zfs_args, bkpath,
+	    ZFS_MAX_DATASET_NAME_LEN);
 
 	if (err != 0) {
 		NDMP_LOG(LOG_DEBUG, "error getting bkup path: %d", err);
@@ -1152,7 +1153,7 @@ ndmpd_zfs_backup_parms_valid(ndmpd_zfs_args_t *ndmpd_zfs_args)
 		}
 
 		(void) strlcpy(ndmpd_zfs_args->nz_fromsnap,
-		    snapdata.nzs_snapname, ZFS_MAXNAMELEN);
+		    snapdata.nzs_snapname, ZFS_MAX_DATASET_NAME_LEN);
 	}
 
 	return (B_TRUE);
@@ -1167,14 +1168,14 @@ ndmpd_zfs_backup_parms_valid(ndmpd_zfs_args_t *ndmpd_zfs_args)
 static boolean_t
 ndmpd_zfs_backup_pathvalid(ndmpd_zfs_args_t *ndmpd_zfs_args)
 {
-	char zpath[ZFS_MAXNAMELEN];
+	char zpath[ZFS_MAX_DATASET_NAME_LEN];
 	char propstr[ZFS_MAXPROPLEN];
 	zfs_handle_t *zhp;
 	zfs_type_t ztype = 0;
 	int err;
 
-	if (ndmpd_zfs_backup_getpath(ndmpd_zfs_args, zpath, ZFS_MAXNAMELEN)
-	    != 0)
+	if (ndmpd_zfs_backup_getpath(ndmpd_zfs_args, zpath,
+	    ZFS_MAX_DATASET_NAME_LEN) != 0)
 		return (B_FALSE);
 
 	if (ndmpd_zfs_args->nz_snapname[0] != '\0') {
@@ -1259,13 +1260,13 @@ ndmpd_zfs_backup_getpath(ndmpd_zfs_args_t *ndmpd_zfs_args, char *zpath,
 
 	(void) strlcpy(zpath, &env_path[1], zlen);
 	(void) strlcpy(ndmpd_zfs_args->nz_dataset, &env_path[1],
-	    ZFS_MAXNAMELEN);
+	    ZFS_MAX_DATASET_NAME_LEN);
 
 	at = strchr(ndmpd_zfs_args->nz_dataset, '@');
 	if (at) {
 		*at = '\0';
 		(void) strlcpy(ndmpd_zfs_args->nz_snapname, ++at,
-		    ZFS_MAXNAMELEN);
+		    ZFS_MAX_DATASET_NAME_LEN);
 	} else {
 		ndmpd_zfs_args->nz_snapname[0] = '\0';
 	}
@@ -1349,7 +1350,7 @@ static int
 ndmpd_zfs_restore_getpath(ndmpd_zfs_args_t *ndmpd_zfs_args)
 {
 	int version = ndmpd_zfs_params->mp_protocol_version;
-	char zpath[ZFS_MAXNAMELEN];
+	char zpath[ZFS_MAX_DATASET_NAME_LEN];
 	mem_ndmp_name_v3_t *namep_v3;
 	char *dataset = ndmpd_zfs_args->nz_dataset;
 	char *nm;
@@ -1357,8 +1358,6 @@ ndmpd_zfs_restore_getpath(ndmpd_zfs_args_t *ndmpd_zfs_args)
 	int len;
 	int err;
 
-	dataset = ndmpd_zfs_args->nz_dataset;
-
 	namep_v3 = (mem_ndmp_name_v3_t *)MOD_GETNAME(ndmpd_zfs_params, 0);
 
 	if (namep_v3 == NULL) {
@@ -1375,12 +1374,12 @@ ndmpd_zfs_restore_getpath(ndmpd_zfs_args_t *ndmpd_zfs_args)
 		}
 
 		(void) strlcpy(dataset, &(namep_v3->nm3_dpath[1]),
-		    ZFS_MAXNAMELEN);
+		    ZFS_MAX_DATASET_NAME_LEN);
 
 		if (namep_v3->nm3_newnm) {
-			(void) strlcat(dataset, "/", ZFS_MAXNAMELEN);
+			(void) strlcat(dataset, "/", ZFS_MAX_DATASET_NAME_LEN);
 			(void) strlcat(dataset, namep_v3->nm3_newnm,
-			    ZFS_MAXNAMELEN);
+			    ZFS_MAX_DATASET_NAME_LEN);
 
 		} else {
 			if (version == NDMPV3) {
@@ -1392,13 +1391,15 @@ ndmpd_zfs_restore_getpath(ndmpd_zfs_args_t *ndmpd_zfs_args)
 				 */
 				p = strrchr(namep_v3->nm3_opath, '/');
 				nm = p? p : namep_v3->nm3_opath;
-				(void) strlcat(dataset, "/", ZFS_MAXNAMELEN);
-				(void) strlcat(dataset, nm, ZFS_MAXNAMELEN);
+				(void) strlcat(dataset, "/",
+				    ZFS_MAX_DATASET_NAME_LEN);
+				(void) strlcat(dataset, nm,
+				    ZFS_MAX_DATASET_NAME_LEN);
 			}
 		}
 	} else {
 		err = ndmpd_zfs_backup_getpath(ndmpd_zfs_args, zpath,
-		    ZFS_MAXNAMELEN);
+		    ZFS_MAX_DATASET_NAME_LEN);
 		if (err)
 			return (err);
 	}
@@ -1784,8 +1785,8 @@ ndmpd_zfs_snapshot_cleanup(ndmpd_zfs_args_t *ndmpd_zfs_args, int err)
 		 * upon for user-supplied snapshots.)
 		 */
 
-		(void) snprintf(snapdata.nzs_snapskip, ZFS_MAXNAMELEN, "%s",
-		    ndmpd_zfs_args->nz_snapname);
+		(void) snprintf(snapdata.nzs_snapskip, ZFS_MAX_DATASET_NAME_LEN,
+		    "%s", ndmpd_zfs_args->nz_snapname);
 
 		if (ndmpd_zfs_snapshot_find(ndmpd_zfs_args, &snapdata)) {
 			NDMP_LOG(LOG_DEBUG, "ndmpd_zfs_snapshot_find error\n");
@@ -1812,7 +1813,7 @@ ndmpd_zfs_snapshot_cleanup(ndmpd_zfs_args_t *ndmpd_zfs_args, int err)
 
 _remove_tmp_snap:
 
-	(void) snprintf(snapdata.nzs_snapname, ZFS_MAXNAMELEN, "%s",
+	(void) snprintf(snapdata.nzs_snapname, ZFS_MAX_DATASET_NAME_LEN, "%s",
 	    ndmpd_zfs_args->nz_snapname);
 
 	(void) strlcpy(snapdata.nzs_snapprop, ndmpd_zfs_args->nz_snapprop,
@@ -1838,7 +1839,7 @@ ndmpd_zfs_snapshot_create(ndmpd_zfs_args_t *ndmpd_zfs_args)
 	boolean_t recursive = B_FALSE;
 
 	if (ndmpd_zfs_snapname_create(ndmpd_zfs_args,
-	    ndmpd_zfs_args->nz_snapname, ZFS_MAXNAMELEN -1) < 0) {
+	    ndmpd_zfs_args->nz_snapname, ZFS_MAX_DATASET_NAME_LEN - 1) < 0) {
 		NDMP_LOG(LOG_ERR, "Error (%d) creating snapshot name for %s",
 		    errno, ndmpd_zfs_args->nz_dataset);
 		return (-1);
@@ -2015,7 +2016,7 @@ ndmpd_zfs_snapshot_prop_find(zfs_handle_t *zhp, void *arg)
 
 	if (strcmp(justsnap, snapdata_p->nzs_snapskip) != 0) {
 		(void) strlcpy(snapdata_p->nzs_snapname, justsnap,
-		    ZFS_MAXNAMELEN);
+		    ZFS_MAX_DATASET_NAME_LEN);
 
 		(void) strlcpy(snapdata_p->nzs_snapprop, propstr,
 		    ZFS_MAXPROPLEN);
@@ -2088,13 +2089,13 @@ ndmpd_zfs_snapshot_prop_get(zfs_handle_t *zhp, char *propstr)
 static int
 ndmpd_zfs_snapshot_prop_add(ndmpd_zfs_args_t *ndmpd_zfs_args)
 {
-	char fullname[ZFS_MAXNAMELEN];
+	char fullname[ZFS_MAX_DATASET_NAME_LEN];
 	char propstr[ZFS_MAXPROPLEN];
 	zfs_handle_t *zhp;
 	boolean_t set;
 	int err;
 
-	(void) snprintf(fullname, ZFS_MAXNAMELEN, "%s@%s",
+	(void) snprintf(fullname, ZFS_MAX_DATASET_NAME_LEN, "%s@%s",
 	    ndmpd_zfs_args->nz_dataset,
 	    ndmpd_zfs_args->nz_snapname);
 
@@ -2211,14 +2212,14 @@ ndmpd_zfs_snapshot_prop_remove(ndmpd_zfs_args_t *ndmpd_zfs_args,
     ndmpd_zfs_snapfind_t *snapdata_p)
 {
 	char findprop_plus_slash[ZFS_MAXPROPLEN];
-	char fullname[ZFS_MAXNAMELEN];
+	char fullname[ZFS_MAX_DATASET_NAME_LEN];
 	char newprop[ZFS_MAXPROPLEN];
 	char tmpstr[ZFS_MAXPROPLEN];
 	zfs_handle_t *zhp;
 	char *ptr;
 	int err;
 
-	(void) snprintf(fullname, ZFS_MAXNAMELEN, "%s@%s",
+	(void) snprintf(fullname, ZFS_MAX_DATASET_NAME_LEN, "%s@%s",
 	    ndmpd_zfs_args->nz_dataset,
 	    snapdata_p->nzs_snapname);
 
diff --git a/usr/src/cmd/ndmpd/tlm/tlm_backup_reader.c b/usr/src/cmd/ndmpd/tlm/tlm_backup_reader.c
index c677572015..a3ca1a2c40 100644
--- a/usr/src/cmd/ndmpd/tlm/tlm_backup_reader.c
+++ b/usr/src/cmd/ndmpd/tlm/tlm_backup_reader.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -1225,7 +1226,8 @@ zfs_put_prop_cb(int prop, void *pp)
 		return (ZPROP_CONT);
 	}
 
-	(void) strlcpy(mpp->mp_name, zfs_prop_to_name(prop), ZFS_MAXNAMELEN);
+	(void) strlcpy(mpp->mp_name, zfs_prop_to_name(prop),
+	    ZFS_MAX_DATASET_NAME_LEN);
 	(void) strlcpy(mpp->mp_value, vbuf, ZFS_MAXPROPLEN);
 
 	switch (stype) {
@@ -1281,12 +1283,13 @@ zfs_put_quota_cb(void *pp, const char *domain, uid_t rid, uint64_t space)
 	else
 		typestr = "groupquota";
 
-	if (domain == NULL || *domain == '\0')
-		(void) snprintf(mpp->mp_name, ZFS_MAXNAMELEN, "%s@%llu",
-		    typestr, (longlong_t)rid);
-	else
-		(void) snprintf(mpp->mp_name, ZFS_MAXNAMELEN, "%s@%s-%llu",
-		    typestr, domain, (longlong_t)rid);
+	if (domain == NULL || *domain == '\0') {
+		(void) snprintf(mpp->mp_name, ZFS_MAX_DATASET_NAME_LEN,
+		    "%s@%llu", typestr, (longlong_t)rid);
+	} else {
+		(void) snprintf(mpp->mp_name, ZFS_MAX_DATASET_NAME_LEN,
+		    "%s@%s-%llu", typestr, domain, (longlong_t)rid);
+	}
 	(void) snprintf(mpp->mp_value, ZFS_MAXPROPLEN, "%llu", space);
 	(void) strlcpy(mpp->mp_source, mhp->nh_dataset, ZFS_MAXPROPLEN);
 
@@ -1429,8 +1432,10 @@ ndmp_include_zfs(ndmp_context_t *nctx, const char *dataset)
 			free(mhp);
 			return (-1);
 		}
-		if ((pname = nvpair_name(elp)) != NULL)
-			(void) strlcpy(mpp->mp_name, pname, ZFS_MAXNAMELEN);
+		if ((pname = nvpair_name(elp)) != NULL) {
+			(void) strlcpy(mpp->mp_name, pname,
+			    ZFS_MAX_DATASET_NAME_LEN);
+		}
 
 		(void) strlcpy(mpp->mp_value, sval, ZFS_MAXPROPLEN);
 		(void) strlcpy(mpp->mp_source, ssrc, ZFS_MAXPROPLEN);
diff --git a/usr/src/cmd/ndmpd/tlm/tlm_lib.c b/usr/src/cmd/ndmpd/tlm/tlm_lib.c
index fa15a8e7ad..666ea3feca 100644
--- a/usr/src/cmd/ndmpd/tlm/tlm_lib.c
+++ b/usr/src/cmd/ndmpd/tlm/tlm_lib.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -723,10 +724,10 @@ tlm_build_snapshot_name(char *name, char *sname, char *jname)
 {
 	zfs_handle_t *zhp;
 	char *rest;
-	char volname[ZFS_MAXNAMELEN];
+	char volname[ZFS_MAX_DATASET_NAME_LEN];
 	char mountpoint[PATH_MAX];
 
-	if (get_zfsvolname(volname, ZFS_MAXNAMELEN, name) == -1)
+	if (get_zfsvolname(volname, ZFS_MAX_DATASET_NAME_LEN, name) == -1)
 		goto notzfs;
 
 	(void) mutex_lock(&zlib_mtx);
@@ -1271,7 +1272,7 @@ boolean_t
 fs_is_chkpntvol(char *path)
 {
 	zfs_handle_t *zhp;
-	char vol[ZFS_MAXNAMELEN];
+	char vol[ZFS_MAX_DATASET_NAME_LEN];
 
 	if (!path || !*path)
 		return (FALSE);
@@ -1303,7 +1304,7 @@ boolean_t
 fs_is_chkpnt_enabled(char *path)
 {
 	zfs_handle_t *zhp;
-	char vol[ZFS_MAXNAMELEN];
+	char vol[ZFS_MAX_DATASET_NAME_LEN];
 
 	if (!path || !*path)
 		return (FALSE);
@@ -1337,15 +1338,13 @@ fs_is_rdonly(char *path)
  * Min/max functions
  */
 unsigned
-min(a, b)
-	unsigned a, b;
+min(unsigned a, unsigned b)
 {
 	return (a < b ? a : b);
 }
 
 unsigned
-max(a, b)
-	unsigned a, b;
+max(unsigned a, unsigned b)
 {
 	return (a > b ? a : b);
 }
diff --git a/usr/src/cmd/oamuser/user/homedir.c b/usr/src/cmd/oamuser/user/homedir.c
index a31ae0b9a2..770cba25c1 100644
--- a/usr/src/cmd/oamuser/user/homedir.c
+++ b/usr/src/cmd/oamuser/user/homedir.c
@@ -102,10 +102,10 @@ create_home(char *homedir, char *skeldir, uid_t uid, gid_t gid, int flags)
 		}
 		if ((dataset = get_mnt_special(pdir, stbuf.st_fstype))
 		    != NULL) {
-			char nm[ZFS_MAXNAMELEN];
+			char nm[ZFS_MAX_DATASET_NAME_LEN];
 			zfs_handle_t *zhp;
 
-			(void) snprintf(nm, ZFS_MAXNAMELEN, "%s/%s",
+			(void) snprintf(nm, sizeof (nm), "%s/%s",
 			    dataset, bname);
 
 			if ((zfs_create(g_zfs, nm, ZFS_TYPE_FILESYSTEM, NULL)
diff --git a/usr/src/cmd/zdb/zdb.c b/usr/src/cmd/zdb/zdb.c
index bb02c51f23..812453b826 100644
--- a/usr/src/cmd/zdb/zdb.c
+++ b/usr/src/cmd/zdb/zdb.c
@@ -60,7 +60,6 @@
 #include <sys/ddt.h>
 #include <sys/zfeature.h>
 #include <zfs_comutil.h>
-#undef ZFS_MAXNAMELEN
 #undef verify
 #include <libzfs.h>
 
@@ -1922,7 +1921,7 @@ dump_dir(objset_t *os)
 	uint64_t refdbytes, usedobjs, scratch;
 	char numbuf[32];
 	char blkbuf[BP_SPRINTF_LEN + 20];
-	char osname[MAXNAMELEN];
+	char osname[ZFS_MAX_DATASET_NAME_LEN];
 	char *type = "UNKNOWN";
 	int verbosity = dump_opt['d'];
 	int print_header = 1;
@@ -3457,7 +3456,7 @@ find_zpool(char **target, nvlist_t **configp, int dirc, char **dirv)
 	nvlist_t *match = NULL;
 	char *name = NULL;
 	char *sepp = NULL;
-	char sep;
+	char sep = '\0';
 	int count = 0;
 	importargs_t args = { 0 };
 
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c
index ff21aede8a..f9318db544 100644
--- a/usr/src/cmd/zfs/zfs_main.c
+++ b/usr/src/cmd/zfs/zfs_main.c
@@ -1546,7 +1546,7 @@ get_callback(zfs_handle_t *zhp, void *data)
 	char buf[ZFS_MAXPROPLEN];
 	char rbuf[ZFS_MAXPROPLEN];
 	zprop_source_t sourcetype;
-	char source[ZFS_MAXNAMELEN];
+	char source[ZFS_MAX_DATASET_NAME_LEN];
 	zprop_get_cbdata_t *cbp = data;
 	nvlist_t *user_props = zfs_get_user_props(zhp);
 	zprop_list_t *pl = cbp->cb_proplist;
@@ -2029,7 +2029,7 @@ typedef struct upgrade_cbdata {
 	uint64_t cb_version;
 	boolean_t cb_newer;
 	boolean_t cb_foundone;
-	char cb_lastfs[ZFS_MAXNAMELEN];
+	char cb_lastfs[ZFS_MAX_DATASET_NAME_LEN];
 } upgrade_cbdata_t;
 
 static int
@@ -2475,7 +2475,7 @@ userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
 
 	if (domain != NULL && domain[0] != '\0') {
 		/* SMB */
-		char sid[ZFS_MAXNAMELEN + 32];
+		char sid[MAXNAMELEN + 32];
 		uid_t id;
 		int err;
 		int flag = IDMAP_REQ_FLG_USE_CACHE;
@@ -2604,7 +2604,7 @@ print_us_node(boolean_t scripted, boolean_t parsable, int *fields, int types,
     size_t *width, us_node_t *node)
 {
 	nvlist_t *nvl = node->usn_nvl;
-	char valstr[ZFS_MAXNAMELEN];
+	char valstr[MAXNAMELEN];
 	boolean_t first = B_TRUE;
 	int cfield = 0;
 	int field;
@@ -3485,7 +3485,7 @@ zfs_do_rollback(int argc, char **argv)
 	boolean_t force = B_FALSE;
 	rollback_cbdata_t cb = { 0 };
 	zfs_handle_t *zhp, *snap;
-	char parentname[ZFS_MAXNAMELEN];
+	char parentname[ZFS_MAX_DATASET_NAME_LEN];
 	char *delim;
 
 	/* check options */
@@ -3885,7 +3885,7 @@ zfs_do_send(int argc, char **argv)
 	 */
 	if (strchr(argv[0], '@') == NULL ||
 	    (fromname && strchr(fromname, '#') != NULL)) {
-		char frombuf[ZFS_MAXNAMELEN];
+		char frombuf[ZFS_MAX_DATASET_NAME_LEN];
 		enum lzc_send_flags lzc_flags = 0;
 
 		if (flags.replicate || flags.doall || flags.props ||
@@ -3937,7 +3937,7 @@ zfs_do_send(int argc, char **argv)
 	 * case if they specify the origin.
 	 */
 	if (fromname && (cp = strchr(fromname, '@')) != NULL) {
-		char origin[ZFS_MAXNAMELEN];
+		char origin[ZFS_MAX_DATASET_NAME_LEN];
 		zprop_source_t src;
 
 		(void) zfs_prop_get(zhp, ZFS_PROP_ORIGIN,
@@ -4071,7 +4071,7 @@ zfs_do_receive(int argc, char **argv)
 			usage(B_FALSE);
 		}
 
-		char namebuf[ZFS_MAXNAMELEN];
+		char namebuf[ZFS_MAX_DATASET_NAME_LEN];
 		(void) snprintf(namebuf, sizeof (namebuf),
 		    "%s/%%recv", argv[0]);
 
@@ -4929,7 +4929,7 @@ store_allow_perm(zfs_deleg_who_type_t type, boolean_t local, boolean_t descend,
 {
 	int i;
 	char ld[2] = { '\0', '\0' };
-	char who_buf[ZFS_MAXNAMELEN+32];
+	char who_buf[MAXNAMELEN + 32];
 	char base_type = '\0';
 	char set_type = '\0';
 	nvlist_t *base_nvl = NULL;
@@ -5297,7 +5297,7 @@ static void
 print_fs_perms(fs_perm_set_t *fspset)
 {
 	fs_perm_node_t *node = NULL;
-	char buf[ZFS_MAXNAMELEN+32];
+	char buf[MAXNAMELEN + 32];
 	const char *dsname = buf;
 
 	for (node = uu_list_first(fspset->fsps_list); node != NULL;
@@ -5306,7 +5306,7 @@ print_fs_perms(fs_perm_set_t *fspset)
 		uu_avl_t *uge_avl = node->fspn_fsperm.fsp_uge_avl;
 		int left = 0;
 
-		(void) snprintf(buf, ZFS_MAXNAMELEN+32,
+		(void) snprintf(buf, sizeof (buf),
 		    gettext("---- Permissions on %s "),
 		    node->fspn_fsperm.fsp_name);
 		(void) printf(dsname);
@@ -5503,7 +5503,7 @@ zfs_do_hold_rele_impl(int argc, char **argv, boolean_t holding)
 
 	for (i = 0; i < argc; ++i) {
 		zfs_handle_t *zhp;
-		char parent[ZFS_MAXNAMELEN];
+		char parent[ZFS_MAX_DATASET_NAME_LEN];
 		const char *delim;
 		char *path = argv[i];
 
@@ -5631,7 +5631,7 @@ holds_callback(zfs_handle_t *zhp, void *data)
 	nvlist_t *nvl = NULL;
 	nvpair_t *nvp = NULL;
 	const char *zname = zfs_get_name(zhp);
-	size_t znamelen = strnlen(zname, ZFS_MAXNAMELEN);
+	size_t znamelen = strlen(zname);
 
 	if (cbp->cb_recursive) {
 		const char *snapname;
@@ -5652,7 +5652,7 @@ holds_callback(zfs_handle_t *zhp, void *data)
 
 	while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) {
 		const char *tag = nvpair_name(nvp);
-		size_t taglen = strnlen(tag, MAXNAMELEN);
+		size_t taglen = strlen(tag);
 		if (taglen > cbp->cb_max_taglen)
 			cbp->cb_max_taglen  = taglen;
 	}
@@ -6902,7 +6902,7 @@ zfs_do_diff(int argc, char **argv)
 static int
 zfs_do_bookmark(int argc, char **argv)
 {
-	char snapname[ZFS_MAXNAMELEN];
+	char snapname[ZFS_MAX_DATASET_NAME_LEN];
 	zfs_handle_t *zhp;
 	nvlist_t *nvl;
 	int ret = 0;
diff --git a/usr/src/cmd/zhack/zhack.c b/usr/src/cmd/zhack/zhack.c
index 8d8fccb15b..79ca3a7e6c 100644
--- a/usr/src/cmd/zhack/zhack.c
+++ b/usr/src/cmd/zhack/zhack.c
@@ -48,7 +48,6 @@
 #include <sys/zio_compress.h>
 #include <sys/zfeature.h>
 #include <sys/dmu_tx.h>
-#undef ZFS_MAXNAMELEN
 #undef verify
 #include <libzfs.h>
 
diff --git a/usr/src/cmd/zoneadm/zfs.c b/usr/src/cmd/zoneadm/zfs.c
index a318a06dfb..214340d0ce 100644
--- a/usr/src/cmd/zoneadm/zfs.c
+++ b/usr/src/cmd/zoneadm/zfs.c
@@ -21,8 +21,8 @@
 
 /*
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2012, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2016 Martin Matuska. All rights reserved.
  */
 
@@ -261,7 +261,7 @@ take_snapshot(zfs_handle_t *zhp, char *snapshot_name, int snap_size,
     char *presnapbuf, char *postsnapbuf)
 {
 	int			res;
-	char			template[ZFS_MAXNAMELEN];
+	char			template[ZFS_MAX_DATASET_NAME_LEN];
 	zfs_snapshot_data_t	cb;
 
 	/*
@@ -563,8 +563,8 @@ static int
 get_direct_clone(zfs_handle_t *zhp, void *data)
 {
 	clone_data_t	*cd = data;
-	char		origin[ZFS_MAXNAMELEN];
-	char		ds_path[ZFS_MAXNAMELEN];
+	char		origin[ZFS_MAX_DATASET_NAME_LEN];
+	char		ds_path[ZFS_MAX_DATASET_NAME_LEN];
 
 	if (zfs_get_type(zhp) != ZFS_TYPE_FILESYSTEM) {
 		zfs_close(zhp);
@@ -668,7 +668,7 @@ rename_snap(zfs_handle_t *zhp, void *data)
 {
 	int			res;
 	zfs_snapshot_data_t	*cbp;
-	char			template[ZFS_MAXNAMELEN];
+	char			template[ZFS_MAX_DATASET_NAME_LEN];
 
 	cbp = (zfs_snapshot_data_t *)data;
 
@@ -724,8 +724,8 @@ static int
 promote_clone(zfs_handle_t *src_zhp, zfs_handle_t *cln_zhp)
 {
 	zfs_snapshot_data_t	sd;
-	char			nm[ZFS_MAXNAMELEN];
-	char			template[ZFS_MAXNAMELEN];
+	char			nm[ZFS_MAX_DATASET_NAME_LEN];
+	char			template[ZFS_MAX_DATASET_NAME_LEN];
 
 	(void) strlcpy(nm, zfs_get_name(cln_zhp), sizeof (nm));
 	/*
@@ -785,7 +785,7 @@ int
 promote_all_clones(zfs_handle_t *zhp)
 {
 	clone_data_t	cd;
-	char		nm[ZFS_MAXNAMELEN];
+	char		nm[ZFS_MAX_DATASET_NAME_LEN];
 
 	cd.clone_zhp = NULL;
 	cd.origin_creation = 0;
@@ -1207,7 +1207,7 @@ verify_datasets(zone_dochandle_t handle)
 	struct zone_dstab dstab;
 	zfs_handle_t *zhp;
 	char propbuf[ZFS_MAXPROPLEN];
-	char source[ZFS_MAXNAMELEN];
+	char source[ZFS_MAX_DATASET_NAME_LEN];
 	zprop_source_t srctype;
 
 	if (zonecfg_setdsent(handle) != Z_OK) {
diff --git a/usr/src/cmd/ztest/ztest.c b/usr/src/cmd/ztest/ztest.c
index 0b238eba6f..a3800f60ce 100644
--- a/usr/src/cmd/ztest/ztest.c
+++ b/usr/src/cmd/ztest/ztest.c
@@ -139,8 +139,8 @@ typedef struct ztest_shared_hdr {
 static ztest_shared_hdr_t *ztest_shared_hdr;
 
 typedef struct ztest_shared_opts {
-	char zo_pool[MAXNAMELEN];
-	char zo_dir[MAXNAMELEN];
+	char zo_pool[ZFS_MAX_DATASET_NAME_LEN];
+	char zo_dir[ZFS_MAX_DATASET_NAME_LEN];
 	char zo_alt_ztest[MAXNAMELEN];
 	char zo_alt_libpath[MAXNAMELEN];
 	uint64_t zo_vdevs;
@@ -266,7 +266,7 @@ typedef struct ztest_od {
 	uint64_t	od_crblocksize;
 	uint64_t	od_gen;
 	uint64_t	od_crgen;
-	char		od_name[MAXNAMELEN];
+	char		od_name[ZFS_MAX_DATASET_NAME_LEN];
 } ztest_od_t;
 
 /*
@@ -278,7 +278,7 @@ typedef struct ztest_ds {
 	rwlock_t	zd_zilog_lock;
 	zilog_t		*zd_zilog;
 	ztest_od_t	*zd_od;		/* debugging aid */
-	char		zd_name[MAXNAMELEN];
+	char		zd_name[ZFS_MAX_DATASET_NAME_LEN];
 	mutex_t		zd_dirobj_lock;
 	rll_t		zd_object_lock[ZTEST_OBJECT_LOCKS];
 	rll_t		zd_range_lock[ZTEST_RANGE_LOCKS];
@@ -3225,7 +3225,7 @@ ztest_objset_destroy_cb(const char *name, void *arg)
 static boolean_t
 ztest_snapshot_create(char *osname, uint64_t id)
 {
-	char snapname[MAXNAMELEN];
+	char snapname[ZFS_MAX_DATASET_NAME_LEN];
 	int error;
 
 	(void) snprintf(snapname, sizeof (snapname), "%llu", (u_longlong_t)id);
@@ -3245,10 +3245,10 @@ ztest_snapshot_create(char *osname, uint64_t id)
 static boolean_t
 ztest_snapshot_destroy(char *osname, uint64_t id)
 {
-	char snapname[MAXNAMELEN];
+	char snapname[ZFS_MAX_DATASET_NAME_LEN];
 	int error;
 
-	(void) snprintf(snapname, MAXNAMELEN, "%s@%llu", osname,
+	(void) snprintf(snapname, sizeof (snapname), "%s@%llu", osname,
 	    (u_longlong_t)id);
 
 	error = dsl_destroy_snapshot(snapname, B_FALSE);
@@ -3265,12 +3265,12 @@ ztest_dmu_objset_create_destroy(ztest_ds_t *zd, uint64_t id)
 	int iters;
 	int error;
 	objset_t *os, *os2;
-	char name[MAXNAMELEN];
+	char name[ZFS_MAX_DATASET_NAME_LEN];
 	zilog_t *zilog;
 
 	(void) rw_rdlock(&ztest_name_lock);
 
-	(void) snprintf(name, MAXNAMELEN, "%s/temp_%llu",
+	(void) snprintf(name, sizeof (name), "%s/temp_%llu",
 	    ztest_opts.zo_pool, (u_longlong_t)id);
 
 	/*
@@ -3376,18 +3376,23 @@ ztest_dmu_snapshot_create_destroy(ztest_ds_t *zd, uint64_t id)
 void
 ztest_dsl_dataset_cleanup(char *osname, uint64_t id)
 {
-	char snap1name[MAXNAMELEN];
-	char clone1name[MAXNAMELEN];
-	char snap2name[MAXNAMELEN];
-	char clone2name[MAXNAMELEN];
-	char snap3name[MAXNAMELEN];
+	char snap1name[ZFS_MAX_DATASET_NAME_LEN];
+	char clone1name[ZFS_MAX_DATASET_NAME_LEN];
+	char snap2name[ZFS_MAX_DATASET_NAME_LEN];
+	char clone2name[ZFS_MAX_DATASET_NAME_LEN];
+	char snap3name[ZFS_MAX_DATASET_NAME_LEN];
 	int error;
 
-	(void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname, id);
-	(void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname, id);
-	(void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name, id);
-	(void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname, id);
-	(void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name, id);
+	(void) snprintf(snap1name, sizeof (snap1name),
+	    "%s@s1_%llu", osname, id);
+	(void) snprintf(clone1name, sizeof (clone1name),
+	    "%s/c1_%llu", osname, id);
+	(void) snprintf(snap2name, sizeof (snap2name),
+	    "%s@s2_%llu", clone1name, id);
+	(void) snprintf(clone2name, sizeof (clone2name),
+	    "%s/c2_%llu", osname, id);
+	(void) snprintf(snap3name, sizeof (snap3name),
+	    "%s@s3_%llu", clone1name, id);
 
 	error = dsl_destroy_head(clone2name);
 	if (error && error != ENOENT)
@@ -3413,11 +3418,11 @@ void
 ztest_dsl_dataset_promote_busy(ztest_ds_t *zd, uint64_t id)
 {
 	objset_t *os;
-	char snap1name[MAXNAMELEN];
-	char clone1name[MAXNAMELEN];
-	char snap2name[MAXNAMELEN];
-	char clone2name[MAXNAMELEN];
-	char snap3name[MAXNAMELEN];
+	char snap1name[ZFS_MAX_DATASET_NAME_LEN];
+	char clone1name[ZFS_MAX_DATASET_NAME_LEN];
+	char snap2name[ZFS_MAX_DATASET_NAME_LEN];
+	char clone2name[ZFS_MAX_DATASET_NAME_LEN];
+	char snap3name[ZFS_MAX_DATASET_NAME_LEN];
 	char *osname = zd->zd_name;
 	int error;
 
@@ -3425,11 +3430,16 @@ ztest_dsl_dataset_promote_busy(ztest_ds_t *zd, uint64_t id)
 
 	ztest_dsl_dataset_cleanup(osname, id);
 
-	(void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname, id);
-	(void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname, id);
-	(void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name, id);
-	(void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname, id);
-	(void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name, id);
+	(void) snprintf(snap1name, sizeof (snap1name),
+	    "%s@s1_%llu", osname, id);
+	(void) snprintf(clone1name, sizeof (clone1name),
+	    "%s/c1_%llu", osname, id);
+	(void) snprintf(snap2name, sizeof (snap2name),
+	    "%s@s2_%llu", clone1name, id);
+	(void) snprintf(clone2name, sizeof (clone2name),
+	    "%s/c2_%llu", osname, id);
+	(void) snprintf(snap3name, sizeof (snap3name),
+	    "%s@s3_%llu", clone1name, id);
 
 	error = dmu_objset_snapshot_one(osname, strchr(snap1name, '@') + 1);
 	if (error && error != EEXIST) {
@@ -4248,7 +4258,7 @@ ztest_fzap(ztest_ds_t *zd, uint64_t id)
 	 * 2050 entries we should see ptrtbl growth and leaf-block split.
 	 */
 	for (int i = 0; i < 2050; i++) {
-		char name[MAXNAMELEN];
+		char name[ZFS_MAX_DATASET_NAME_LEN];
 		uint64_t value = i;
 		dmu_tx_t *tx;
 		int error;
@@ -4653,7 +4663,7 @@ ztest_dmu_snapshot_hold(ztest_ds_t *zd, uint64_t id)
 	char fullname[100];
 	char clonename[100];
 	char tag[100];
-	char osname[MAXNAMELEN];
+	char osname[ZFS_MAX_DATASET_NAME_LEN];
 	nvlist_t *holds;
 
 	(void) rw_rdlock(&ztest_name_lock);
@@ -5473,13 +5483,13 @@ ztest_thread(void *arg)
 static void
 ztest_dataset_name(char *dsname, char *pool, int d)
 {
-	(void) snprintf(dsname, MAXNAMELEN, "%s/ds_%d", pool, d);
+	(void) snprintf(dsname, ZFS_MAX_DATASET_NAME_LEN, "%s/ds_%d", pool, d);
 }
 
 static void
 ztest_dataset_destroy(int d)
 {
-	char name[MAXNAMELEN];
+	char name[ZFS_MAX_DATASET_NAME_LEN];
 
 	ztest_dataset_name(name, ztest_opts.zo_pool, d);
 
@@ -5528,7 +5538,7 @@ ztest_dataset_open(int d)
 	uint64_t committed_seq = ZTEST_GET_SHARED_DS(d)->zd_seq;
 	objset_t *os;
 	zilog_t *zilog;
-	char name[MAXNAMELEN];
+	char name[ZFS_MAX_DATASET_NAME_LEN];
 	int error;
 
 	ztest_dataset_name(name, ztest_opts.zo_pool, d);
@@ -5751,8 +5761,8 @@ ztest_run(ztest_shared_t *zs)
 	 * different name.
 	 */
 	if (ztest_random(2) == 0) {
-		char name[MAXNAMELEN];
-		(void) snprintf(name, MAXNAMELEN, "%s_import",
+		char name[ZFS_MAX_DATASET_NAME_LEN];
+		(void) snprintf(name, sizeof (name), "%s_import",
 		    ztest_opts.zo_pool);
 		ztest_spa_import_export(ztest_opts.zo_pool, name);
 		ztest_spa_import_export(name, ztest_opts.zo_pool);
@@ -6316,7 +6326,7 @@ main(int argc, char **argv)
 		if (spa_open(ztest_opts.zo_pool, &spa, FTAG) == 0) {
 			spa_close(spa, FTAG);
 		} else {
-			char tmpname[MAXNAMELEN];
+			char tmpname[ZFS_MAX_DATASET_NAME_LEN];
 			kernel_fini();
 			kernel_init(FREAD | FWRITE);
 			(void) snprintf(tmpname, sizeof (tmpname), "%s_tmp",