Test clean-out from #13165

cmd/zed/zed.d/all-debug.sh

@@ -15,7 +15,7 @@ zed_exit_if_ignoring_this_event
 
 zed_lock "${ZED_DEBUG_LOG}"
 {
-	printenv | sort
+	env | sort
 	echo
 } 1>&"${ZED_FLOCK_FD}"
 zed_unlock "${ZED_DEBUG_LOG}"

cmd/zed/zed.d/zed-functions.sh

@@ -76,8 +76,7 @@ zed_log_msg()
 #
 zed_log_err()
 {
-    logger -p "${ZED_SYSLOG_PRIORITY}" -t "${ZED_SYSLOG_TAG}" -- "error:" \
-        "${0##*/}:""${ZEVENT_EID:+" eid=${ZEVENT_EID}:"}" "$@"
+    zed_log_msg "error: ${0##*/}:""${ZEVENT_EID:+" eid=${ZEVENT_EID}:"}" "$@"
 }
 
 

cmd/zfs/zfs_main.c

@@ -486,10 +486,7 @@ usage_prop_cb(int prop, void *cb)
 	else
 		(void) fprintf(fp, "   NO   ");
 
-	if (zfs_prop_values(prop) == NULL)
-		(void) fprintf(fp, "-\n");
-	else
-		(void) fprintf(fp, "%s\n", zfs_prop_values(prop));
+	(void) fprintf(fp, "%s\n", zfs_prop_values(prop) ?: "-");
 
 	return (ZPROP_CONT);
 }
@@ -8702,7 +8699,7 @@ main(int argc, char **argv)
 	 * Many commands modify input strings for string parsing reasons.
 	 * We create a copy to protect the original argv.
 	 */
-	newargv = malloc((argc + 1) * sizeof (newargv[0]));
+	newargv = safe_malloc((argc + 1) * sizeof (newargv[0]));
 	for (i = 0; i < argc; i++)
 		newargv[i] = strdup(argv[i]);
 	newargv[argc] = NULL;

cmd/zpool/zpool_main.c

@@ -10924,7 +10924,7 @@ main(int argc, char **argv)
 	 * Many commands modify input strings for string parsing reasons.
 	 * We create a copy to protect the original argv.
 	 */
-	newargv = malloc((argc + 1) * sizeof (newargv[0]));
+	newargv = safe_malloc((argc + 1) * sizeof (newargv[0]));
 	for (i = 0; i < argc; i++)
 		newargv[i] = strdup(argv[i]);
 	newargv[argc] = NULL;

config/kernel-global_page_state.m4

@@ -55,7 +55,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_ENUM_MEMBER], [
 	AC_MSG_CHECKING([whether enum $2 contains $1])
 	AS_IF([AC_TRY_COMMAND(
-	    "${srcdir}/scripts/enum-extract.pl" "$2" "$3" | egrep -qx $1)],[
+	    "${srcdir}/scripts/enum-extract.pl" "$2" "$3" | grep -Eqx $1)],[
 		AC_MSG_RESULT([yes])
 		AC_DEFINE(m4_join([_], [ZFS_ENUM], m4_toupper($2), $1), 1,
 		    [enum $2 contains $1])

config/kernel.m4

@@ -392,11 +392,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 	utsrelease1=$kernelbuild/include/linux/version.h
 	utsrelease2=$kernelbuild/include/linux/utsrelease.h
 	utsrelease3=$kernelbuild/include/generated/utsrelease.h
-	AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [
+	AS_IF([test -r $utsrelease1 && grep -qF UTS_RELEASE $utsrelease1], [
 		utsrelease=$utsrelease1
-	], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [
+	], [test -r $utsrelease2 && grep -qF UTS_RELEASE $utsrelease2], [
 		utsrelease=$utsrelease2
-	], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [
+	], [test -r $utsrelease3 && grep -qF UTS_RELEASE $utsrelease3], [
 		utsrelease=$utsrelease3
 	])
 

config/zfs-build.m4

@@ -173,7 +173,7 @@ AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [
 ])
 
 AC_DEFUN([ZFS_AC_DEBUG_INVARIANTS_DETECT_FREEBSD], [
-	AS_IF([sysctl -n kern.conftxt | fgrep -qx $'options\tINVARIANTS'],
+	AS_IF([sysctl -n kern.conftxt | grep -Fqx $'options\tINVARIANTS'],
 		[enable_invariants="yes"],
 		[enable_invariants="no"])
 ])

configure.ac

@@ -201,40 +201,6 @@ AC_CONFIG_FILES([
 	tests/zfs-tests/Makefile
 	tests/zfs-tests/callbacks/Makefile
 	tests/zfs-tests/cmd/Makefile
-	tests/zfs-tests/cmd/badsend/Makefile
-	tests/zfs-tests/cmd/btree_test/Makefile
-	tests/zfs-tests/cmd/chg_usr_exec/Makefile
-	tests/zfs-tests/cmd/devname2devid/Makefile
-	tests/zfs-tests/cmd/draid/Makefile
-	tests/zfs-tests/cmd/dir_rd_update/Makefile
-	tests/zfs-tests/cmd/file_check/Makefile
-	tests/zfs-tests/cmd/file_trunc/Makefile
-	tests/zfs-tests/cmd/file_write/Makefile
-	tests/zfs-tests/cmd/get_diff/Makefile
-	tests/zfs-tests/cmd/getversion/Makefile
-	tests/zfs-tests/cmd/largest_file/Makefile
-	tests/zfs-tests/cmd/libzfs_input_check/Makefile
-	tests/zfs-tests/cmd/mkbusy/Makefile
-	tests/zfs-tests/cmd/mkfile/Makefile
-	tests/zfs-tests/cmd/mkfiles/Makefile
-	tests/zfs-tests/cmd/mktree/Makefile
-	tests/zfs-tests/cmd/mmap_exec/Makefile
-	tests/zfs-tests/cmd/mmap_libaio/Makefile
-	tests/zfs-tests/cmd/mmap_seek/Makefile
-	tests/zfs-tests/cmd/mmapwrite/Makefile
-	tests/zfs-tests/cmd/nvlist_to_lua/Makefile
-	tests/zfs-tests/cmd/randfree_file/Makefile
-	tests/zfs-tests/cmd/randwritecomp/Makefile
-	tests/zfs-tests/cmd/readmmap/Makefile
-	tests/zfs-tests/cmd/read_dos_attributes/Makefile
-	tests/zfs-tests/cmd/rename_dir/Makefile
-	tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile
-	tests/zfs-tests/cmd/send_doall/Makefile
-	tests/zfs-tests/cmd/stride_dd/Makefile
-	tests/zfs-tests/cmd/threadsappend/Makefile
-	tests/zfs-tests/cmd/user_ns_exec/Makefile
-	tests/zfs-tests/cmd/write_dos_attributes/Makefile
-	tests/zfs-tests/cmd/xattrtest/Makefile
 	tests/zfs-tests/include/Makefile
 	tests/zfs-tests/tests/Makefile
 	tests/zfs-tests/tests/functional/Makefile

contrib/pyzfs/libzfs_core/test/test_libzfs_core.py

@@ -1903,6 +1903,8 @@ def test_send_to_ro_file(self):
             with self.assertRaises(lzc_exc.StreamIOError) as ctx:
                 lzc.lzc_send(snap, None, fd)
             os.close(fd)
+            os.unlink(output.name)
+
         self.assertEqual(ctx.exception.errno, errno.EBADF)
 
     def test_recv_full(self):

lib/libshare/os/linux/smb.c

@@ -323,8 +323,6 @@ smb_disable_share_one(const char *sharename)
 static int
 smb_disable_share(sa_share_impl_t impl_share)
 {
-	smb_share_t *shares = smb_shares;
-
 	if (!smb_available()) {
 		/*
 		 * The share can't possibly be active, so nothing
@@ -333,12 +331,9 @@ smb_disable_share(sa_share_impl_t impl_share)
 		return (SA_OK);
 	}
 
-	while (shares != NULL) {
-		if (strcmp(impl_share->sa_mountpoint, shares->path) == 0)
-			return (smb_disable_share_one(shares->name));
-
-		shares = shares->next;
-	}
+	for (const smb_share_t *i = smb_shares; i != NULL; i = i->next)
+		if (strcmp(impl_share->sa_mountpoint, i->path) == 0)
+			return (smb_disable_share_one(i->name));
 
 	return (SA_OK);
 }
@@ -362,21 +357,16 @@ smb_validate_shareopts(const char *shareopts)
 static boolean_t
 smb_is_share_active(sa_share_impl_t impl_share)
 {
-	smb_share_t *iter = smb_shares;
-
 	if (!smb_available())
 		return (B_FALSE);
 
 	/* Retrieve the list of (possible) active shares */
 	smb_retrieve_shares();
 
-	while (iter != NULL) {
-		if (strcmp(impl_share->sa_mountpoint, iter->path) == 0)
+	for (const smb_share_t *i = smb_shares; i != NULL; i = i->next)
+		if (strcmp(impl_share->sa_mountpoint, i->path) == 0)
 			return (B_TRUE);
 
-		iter = iter->next;
-	}
-
 	return (B_FALSE);
 }
 

module/zstd/zfs_zstd.c

@@ -50,7 +50,7 @@
 #include "lib/zstd.h"
 #include "lib/common/zstd_errors.h"
 
-kstat_t *zstd_ksp = NULL;
+static kstat_t *zstd_ksp = NULL;
 
 typedef struct zstd_stats {
 	kstat_named_t	zstd_stat_alloc_fail;