Tag zfs-2.0.3

META file and changelog updated.

Signed-off-by: Tony Hutter <hutter2@llnl.gov>

.github/workflows/checkstyle.yaml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   checkstyle:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:

.github/workflows/zfs-tests-functional.yml

@@ -44,12 +44,6 @@ jobs:
         sudo sed -i.bak 's/updates/extra updates/' /etc/depmod.d/ubuntu.conf
         sudo depmod
         sudo modprobe zfs
-        # Workaround to provide additional free space for testing.
-        #   https://github.com/actions/virtual-environments/issues/2840
-        sudo rm -rf /usr/share/dotnet
-        sudo rm -rf /opt/ghc
-        sudo rm -rf "/usr/local/share/boost"
-        sudo rm -rf "$AGENT_TOOLSDIRECTORY"
     - name: Tests
       run: |
         /usr/share/zfs/zfs-tests.sh -v -s 3G

.github/workflows/zfs-tests-sanity.yml

@@ -40,12 +40,6 @@ jobs:
         sudo sed -i.bak 's/updates/extra updates/' /etc/depmod.d/ubuntu.conf
         sudo depmod
         sudo modprobe zfs
-        # Workaround to provide additional free space for testing.
-        #   https://github.com/actions/virtual-environments/issues/2840
-        sudo rm -rf /usr/share/dotnet
-        sudo rm -rf /opt/ghc
-        sudo rm -rf "/usr/local/share/boost"
-        sudo rm -rf "$AGENT_TOOLSDIRECTORY"
     - name: Tests
       run: |
         /usr/share/zfs/zfs-tests.sh -v -s 3G -r sanity

META

@@ -1,10 +1,10 @@
 Meta:          1
 Name:          zfs
 Branch:        1.0
-Version:       2.0.5
+Version:       2.0.3
 Release:       1
 Release-Tags:  relext
 License:       CDDL
 Author:        OpenZFS
-Linux-Maximum: 5.12
+Linux-Maximum: 5.10
 Linux-Minimum: 3.10

Makefile.am

@@ -25,6 +25,7 @@ endif
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST  = autogen.sh copy-builtin
+EXTRA_DIST += cppcheck-suppressions.txt
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md
 EXTRA_DIST += CODE_OF_CONDUCT.md
@@ -161,7 +162,7 @@ checkbashisms:
 				-o -name '90zfs' -prune \
 				-o -type f ! -name 'config*' \
 				! -name 'libtool' \
-			-exec sh -c 'awk "NR==1 && /#!.*bin\/sh.*/ {print FILENAME;}" "{}"' \;); \
+			-exec sh -c 'awk "NR==1 && /\#\!.*bin\/sh.*/ {print FILENAME;}" "{}"' \;); \
 	else \
 		echo "skipping checkbashisms because checkbashisms is not installed"; \
 	fi
@@ -203,13 +204,13 @@ vcscheck:
 PHONY += lint
 lint: cppcheck paxcheck
 
-CPPCHECKDIRS = cmd lib module
 PHONY += cppcheck
-cppcheck: $(CPPCHECKDIRS)
-	@if test -n "$(CPPCHECK)"; then \
-		set -e ; for dir in $(CPPCHECKDIRS) ; do \
-			$(MAKE) -C $$dir cppcheck ; \
-		done \
+cppcheck:
+	@if type cppcheck > /dev/null 2>&1; then \
+		cppcheck --quiet --force --error-exitcode=2 --inline-suppr \
+			--suppressions-list=${top_srcdir}/cppcheck-suppressions.txt \
+			-UHAVE_SSE2 -UHAVE_AVX512F -UHAVE_UIO_ZEROCOPY \
+			${top_srcdir}; \
 	else \
 		echo "skipping cppcheck because cppcheck is not installed"; \
 	fi

cmd/Makefile.am

@@ -1,20 +1,10 @@
 SUBDIRS  = zfs zpool zdb zhack zinject zstream zstreamdump ztest
 SUBDIRS += fsck_zfs vdev_id raidz_test zfs_ids_to_path
 
-CPPCHECKDIRS  = zfs zpool zdb zhack zinject zstream ztest
-CPPCHECKDIRS += raidz_test zfs_ids_to_path
-
 if USING_PYTHON
 SUBDIRS += arcstat arc_summary dbufstat
 endif
 
 if BUILD_LINUX
 SUBDIRS += mount_zfs zed zgenhostid zvol_id zvol_wait
-CPPCHECKDIRS += mount_zfs zed zgenhostid zvol_id
 endif
-
-PHONY = cppcheck
-cppcheck: $(CPPCHECKDIRS)
-	set -e ; for dir in $(CPPCHECKDIRS) ; do \
-		$(MAKE) -C $$dir cppcheck ; \
-	done

cmd/mount_zfs/Makefile.am

@@ -18,5 +18,3 @@ mount_zfs_LDADD = \
 	$(abs_top_builddir)/lib/libnvpair/libnvpair.la
 
 mount_zfs_LDADD += $(LTLIBINTL)
-
-include $(top_srcdir)/config/CppCheck.am

cmd/raidz_test/Makefile.am

@@ -18,5 +18,3 @@ raidz_test_LDADD = \
 	$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la
 
 raidz_test_LDADD += -lm
-
-include $(top_srcdir)/config/CppCheck.am

cmd/zdb/Makefile.am

@@ -14,5 +14,3 @@ zdb_LDADD = \
 	$(abs_top_builddir)/lib/libzpool/libzpool.la \
 	$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
 	$(abs_top_builddir)/lib/libnvpair/libnvpair.la
-
-include $(top_srcdir)/config/CppCheck.am

cmd/zdb/zdb.c

@@ -5840,8 +5840,7 @@ zdb_leak_init_prepare_indirect_vdevs(spa_t *spa, zdb_cb_t *zcb)
 		 */
 		VERIFY0(vdev_metaslab_init(vd, 0));
 
-		vdev_indirect_mapping_t *vim __maybe_unused =
-		    vd->vdev_indirect_mapping;
+		vdev_indirect_mapping_t *vim = vd->vdev_indirect_mapping;
 		uint64_t vim_idx = 0;
 		for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
 
@@ -6934,7 +6933,7 @@ verify_checkpoint_vdev_spacemaps(spa_t *checkpoint, spa_t *current)
 		for (uint64_t c = ckpoint_rvd->vdev_children;
 		    c < current_rvd->vdev_children; c++) {
 			vdev_t *current_vd = current_rvd->vdev_child[c];
-			VERIFY3P(current_vd->vdev_checkpoint_sm, ==, NULL);
+			ASSERT3P(current_vd->vdev_checkpoint_sm, ==, NULL);
 		}
 	}
 

cmd/zed/Makefile.am

@@ -47,5 +47,3 @@ zed_LDADD += -lrt $(LIBUDEV_LIBS) $(LIBUUID_LIBS)
 zed_LDFLAGS = -pthread
 
 EXTRA_DIST = agents/README.md
-
-include $(top_srcdir)/config/CppCheck.am

cmd/zed/zed_exec.c

@@ -173,7 +173,6 @@ _zed_exec_fork_child(uint64_t eid, const char *dir, const char *prog,
 		zed_log_msg(LOG_WARNING, "Killing hung \"%s\" pid=%d",
 		    prog, pid);
 		(void) kill(pid, SIGKILL);
-		(void) waitpid(pid, &status, 0);
 	}
 }
 

cmd/zfs/Makefile.am

@@ -21,5 +21,3 @@ zfs_LDADD += $(LTLIBINTL)
 if BUILD_FREEBSD
 zfs_LDADD += -lgeom -ljail
 endif
-
-include $(top_srcdir)/config/CppCheck.am

cmd/zfs/zfs_main.c

@@ -6790,6 +6790,9 @@ report_mount_progress(int current, int total)
 	time_t now = time(NULL);
 	char info[32];
 
+	/* report 1..n instead of 0..n-1 */
+	++current;
+
 	/* display header if we're here for the first time */
 	if (current == 1) {
 		set_progress_header(gettext("Mounting ZFS filesystems"));

cmd/zfs_ids_to_path/Makefile.am

@@ -7,5 +7,3 @@ zfs_ids_to_path_SOURCES = \
 
 zfs_ids_to_path_LDADD = \
         $(abs_top_builddir)/lib/libzfs/libzfs.la
-
-include $(top_srcdir)/config/CppCheck.am

cmd/zgenhostid/Makefile.am

@@ -3,5 +3,3 @@ include $(top_srcdir)/config/Rules.am
 sbin_PROGRAMS = zgenhostid
 
 zgenhostid_SOURCES = zgenhostid.c
-
-include $(top_srcdir)/config/CppCheck.am

cmd/zhack/Makefile.am

@@ -12,5 +12,3 @@ zhack_LDADD = \
 	$(abs_top_builddir)/lib/libzpool/libzpool.la \
 	$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
 	$(abs_top_builddir)/lib/libnvpair/libnvpair.la
-
-include $(top_srcdir)/config/CppCheck.am

cmd/zinject/Makefile.am

@@ -11,5 +11,3 @@ zinject_LDADD = \
 	$(abs_top_builddir)/lib/libzfs/libzfs.la \
 	$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
 	$(abs_top_builddir)/lib/libnvpair/libnvpair.la
-
-include $(top_srcdir)/config/CppCheck.am

cmd/zpool/Makefile.am

@@ -34,8 +34,6 @@ zpool_LDADD += -lgeom
 endif
 zpool_LDADD += -lm $(LIBBLKID_LIBS) $(LIBUUID_LIBS)
 
-include $(top_srcdir)/config/CppCheck.am
-
 zpoolconfdir = $(sysconfdir)/zfs/zpool.d
 zpoolexecdir = $(zfsexecdir)/zpool.d
 

cmd/zpool/zpool_main.c

@@ -2586,8 +2586,8 @@ print_class_vdevs(zpool_handle_t *zhp, status_cbdata_t *cb, nvlist_t *nv,
 /*
  * Display the status for the given pool.
  */
-static int
-show_import(nvlist_t *config, boolean_t report_error)
+static void
+show_import(nvlist_t *config)
 {
 	uint64_t pool_state;
 	vdev_stat_t *vs;
@@ -2619,13 +2619,6 @@ show_import(nvlist_t *config, boolean_t report_error)
 
 	reason = zpool_import_status(config, &msgid, &errata);
 
-	/*
-	 * If we're importing using a cachefile, then we won't report any
-	 * errors unless we are in the scan phase of the import.
-	 */
-	if (reason != ZPOOL_STATUS_OK && !report_error)
-		return (reason);
-
 	(void) printf(gettext("   pool: %s\n"), name);
 	(void) printf(gettext("     id: %llu\n"), (u_longlong_t)guid);
 	(void) printf(gettext("  state: %s"), health);
@@ -2940,7 +2933,6 @@ show_import(nvlist_t *config, boolean_t report_error)
 		    "be part of this pool, though their\n\texact "
 		    "configuration cannot be determined.\n"));
 	}
-	return (0);
 }
 
 static boolean_t
@@ -3079,121 +3071,6 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
 	return (ret);
 }
 
-static int
-import_pools(nvlist_t *pools, nvlist_t *props, char *mntopts, int flags,
-    char *orig_name, char *new_name,
-    boolean_t do_destroyed, boolean_t pool_specified, boolean_t do_all,
-    importargs_t *import)
-{
-	nvlist_t *config = NULL;
-	nvlist_t *found_config = NULL;
-	uint64_t pool_state;
-
-	/*
-	 * At this point we have a list of import candidate configs. Even if
-	 * we were searching by pool name or guid, we still need to
-	 * post-process the list to deal with pool state and possible
-	 * duplicate names.
-	 */
-	int err = 0;
-	nvpair_t *elem = NULL;
-	boolean_t first = B_TRUE;
-	while ((elem = nvlist_next_nvpair(pools, elem)) != NULL) {
-
-		verify(nvpair_value_nvlist(elem, &config) == 0);
-
-		verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE,
-		    &pool_state) == 0);
-		if (!do_destroyed && pool_state == POOL_STATE_DESTROYED)
-			continue;
-		if (do_destroyed && pool_state != POOL_STATE_DESTROYED)
-			continue;
-
-		verify(nvlist_add_nvlist(config, ZPOOL_LOAD_POLICY,
-		    import->policy) == 0);
-
-		if (!pool_specified) {
-			if (first)
-				first = B_FALSE;
-			else if (!do_all)
-				(void) printf("\n");
-
-			if (do_all) {
-				err |= do_import(config, NULL, mntopts,
-				    props, flags);
-			} else {
-				/*
-				 * If we're importing from cachefile, then
-				 * we don't want to report errors until we
-				 * are in the scan phase of the import. If
-				 * we get an error, then we return that error
-				 * to invoke the scan phase.
-				 */
-				if (import->cachefile && !import->scan)
-					err = show_import(config, B_FALSE);
-				else
-					(void) show_import(config, B_TRUE);
-			}
-		} else if (import->poolname != NULL) {
-			char *name;
-
-			/*
-			 * We are searching for a pool based on name.
-			 */
-			verify(nvlist_lookup_string(config,
-			    ZPOOL_CONFIG_POOL_NAME, &name) == 0);
-
-			if (strcmp(name, import->poolname) == 0) {
-				if (found_config != NULL) {
-					(void) fprintf(stderr, gettext(
-					    "cannot import '%s': more than "
-					    "one matching pool\n"),
-					    import->poolname);
-					(void) fprintf(stderr, gettext(
-					    "import by numeric ID instead\n"));
-					err = B_TRUE;
-				}
-				found_config = config;
-			}
-		} else {
-			uint64_t guid;
-
-			/*
-			 * Search for a pool by guid.
-			 */
-			verify(nvlist_lookup_uint64(config,
-			    ZPOOL_CONFIG_POOL_GUID, &guid) == 0);
-
-			if (guid == import->guid)
-				found_config = config;
-		}
-	}
-
-	/*
-	 * If we were searching for a specific pool, verify that we found a
-	 * pool, and then do the import.
-	 */
-	if (pool_specified && err == 0) {
-		if (found_config == NULL) {
-			(void) fprintf(stderr, gettext("cannot import '%s': "
-			    "no such pool available\n"), orig_name);
-			err = B_TRUE;
-		} else {
-			err |= do_import(found_config, new_name,
-			    mntopts, props, flags);
-		}
-	}
-
-	/*
-	 * If we were just looking for pools, report an error if none were
-	 * found.
-	 */
-	if (!pool_specified && first)
-		(void) fprintf(stderr,
-		    gettext("no pools available to import\n"));
-	return (err);
-}
-
 typedef struct target_exists_args {
 	const char	*poolname;
 	uint64_t	poolguid;
@@ -3321,54 +3198,51 @@ zpool_do_checkpoint(int argc, char **argv)
 /*
  * zpool import [-d dir] [-D]
  *       import [-o mntopts] [-o prop=value] ... [-R root] [-D] [-l]
- *              [-d dir | -c cachefile | -s] [-f] -a
+ *              [-d dir | -c cachefile] [-f] -a
  *       import [-o mntopts] [-o prop=value] ... [-R root] [-D] [-l]
- *              [-d dir | -c cachefile | -s] [-f] [-n] [-F] <pool | id>
- *              [newpool]
+ *              [-d dir | -c cachefile] [-f] [-n] [-F] <pool | id> [newpool]
  *
- *	-c	Read pool information from a cachefile instead of searching
- *		devices. If importing from a cachefile config fails, then
- *		fallback to searching for devices only in the directories that
- *		exist in the cachefile.
+ *	 -c	Read pool information from a cachefile instead of searching
+ *		devices.
  *
- *	-d	Scan in a specific directory, other than /dev/.  More than
+ *       -d	Scan in a specific directory, other than /dev/.  More than
  *		one directory can be specified using multiple '-d' options.
  *
- *	-D	Scan for previously destroyed pools or import all or only
- *		specified destroyed pools.
+ *       -D     Scan for previously destroyed pools or import all or only
+ *              specified destroyed pools.
  *
- *	-R	Temporarily import the pool, with all mountpoints relative to
+ *       -R	Temporarily import the pool, with all mountpoints relative to
  *		the given root.  The pool will remain exported when the machine
  *		is rebooted.
  *
- *	-V	Import even in the presence of faulted vdevs.  This is an
- *		intentionally undocumented option for testing purposes, and
- *		treats the pool configuration as complete, leaving any bad
+ *       -V	Import even in the presence of faulted vdevs.  This is an
+ *       	intentionally undocumented option for testing purposes, and
+ *       	treats the pool configuration as complete, leaving any bad
  *		vdevs in the FAULTED state. In other words, it does verbatim
  *		import.
  *
- *	-f	Force import, even if it appears that the pool is active.
+ *       -f	Force import, even if it appears that the pool is active.
  *
- *	-F	Attempt rewind if necessary.
+ *       -F     Attempt rewind if necessary.
  *
- *	-n	See if rewind would work, but don't actually rewind.
+ *       -n     See if rewind would work, but don't actually rewind.
  *
- *	-N	Import the pool but don't mount datasets.
+ *       -N     Import the pool but don't mount datasets.
  *
- *	-T	Specify a starting txg to use for import. This option is
- *		intentionally undocumented option for testing purposes.
+ *       -T     Specify a starting txg to use for import. This option is
+ *       	intentionally undocumented option for testing purposes.
  *
- *	-a	Import all pools found.
+ *       -a	Import all pools found.
  *
- *	-l	Load encryption keys while importing.
+ *       -l	Load encryption keys while importing.
  *
- *	-o	Set property=value and/or temporary mount options (without '=').
+ *       -o	Set property=value and/or temporary mount options (without '=').
  *
- *	-s	Scan using the default search path, the libblkid cache will
- *		not be consulted.
+ *	 -s	Scan using the default search path, the libblkid cache will
+ *	        not be consulted.
  *
- *	--rewind-to-checkpoint
- *		Import the pool and revert back to the checkpoint.
+ *       --rewind-to-checkpoint
+ *       	Import the pool and revert back to the checkpoint.
  *
  * The import command scans for pools to import, and import pools based on pool
  * name and GUID.  The pool can also be renamed as part of the import process.
@@ -3385,11 +3259,15 @@ zpool_do_import(int argc, char **argv)
 	boolean_t do_all = B_FALSE;
 	boolean_t do_destroyed = B_FALSE;
 	char *mntopts = NULL;
+	nvpair_t *elem;
+	nvlist_t *config;
 	uint64_t searchguid = 0;
 	char *searchname = NULL;
 	char *propval;
+	nvlist_t *found_config;
 	nvlist_t *policy = NULL;
 	nvlist_t *props = NULL;
+	boolean_t first;
 	int flags = ZFS_IMPORT_NORMAL;
 	uint32_t rewind_policy = ZPOOL_NO_REWIND;
 	boolean_t dryrun = B_FALSE;
@@ -3397,8 +3275,7 @@ zpool_do_import(int argc, char **argv)
 	boolean_t xtreme_rewind = B_FALSE;
 	boolean_t do_scan = B_FALSE;
 	boolean_t pool_exists = B_FALSE;
-	boolean_t pool_specified = B_FALSE;
-	uint64_t txg = -1ULL;
+	uint64_t pool_state, txg = -1ULL;
 	char *cachefile = NULL;
 	importargs_t idata = { 0 };
 	char *endptr;
@@ -3520,11 +3397,6 @@ zpool_do_import(int argc, char **argv)
 		usage(B_FALSE);
 	}
 
-	if (cachefile && do_scan) {
-		(void) fprintf(stderr, gettext("-c is incompatible with -s\n"));
-		usage(B_FALSE);
-	}
-
 	if ((flags & ZFS_IMPORT_LOAD_KEYS) && (flags & ZFS_IMPORT_ONLY)) {
 		(void) fprintf(stderr, gettext("-l is incompatible with -N\n"));
 		usage(B_FALSE);
@@ -3605,7 +3477,7 @@ zpool_do_import(int argc, char **argv)
 			searchname = argv[0];
 			searchguid = 0;
 		}
-		pool_specified = B_TRUE;
+		found_config = NULL;
 
 		/*
 		 * User specified a name or guid.  Ensure it's unique.
@@ -3684,33 +3556,98 @@ zpool_do_import(int argc, char **argv)
 		return (1);
 	}
 
-	err = import_pools(pools, props, mntopts, flags, argv[0],
-	    argc == 1 ? NULL : argv[1], do_destroyed, pool_specified,
-	    do_all, &idata);
+	/*
+	 * At this point we have a list of import candidate configs. Even if
+	 * we were searching by pool name or guid, we still need to
+	 * post-process the list to deal with pool state and possible
+	 * duplicate names.
+	 */
+	err = 0;
+	elem = NULL;
+	first = B_TRUE;
+	while ((elem = nvlist_next_nvpair(pools, elem)) != NULL) {
+
+		verify(nvpair_value_nvlist(elem, &config) == 0);
+
+		verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE,
+		    &pool_state) == 0);
+		if (!do_destroyed && pool_state == POOL_STATE_DESTROYED)
+			continue;
+		if (do_destroyed && pool_state != POOL_STATE_DESTROYED)
+			continue;
+
+		verify(nvlist_add_nvlist(config, ZPOOL_LOAD_POLICY,
+		    policy) == 0);
+
+		if (argc == 0) {
+			if (first)
+				first = B_FALSE;
+			else if (!do_all)
+				(void) printf("\n");
+
+			if (do_all) {
+				err |= do_import(config, NULL, mntopts,
+				    props, flags);
+			} else {
+				show_import(config);
+			}
+		} else if (searchname != NULL) {
+			char *name;
+
+			/*
+			 * We are searching for a pool based on name.
+			 */
+			verify(nvlist_lookup_string(config,
+			    ZPOOL_CONFIG_POOL_NAME, &name) == 0);
+
+			if (strcmp(name, searchname) == 0) {
+				if (found_config != NULL) {
+					(void) fprintf(stderr, gettext(
+					    "cannot import '%s': more than "
+					    "one matching pool\n"), searchname);
+					(void) fprintf(stderr, gettext(
+					    "import by numeric ID instead\n"));
+					err = B_TRUE;
+				}
+				found_config = config;
+			}
+		} else {
+			uint64_t guid;
+
+			/*
+			 * Search for a pool by guid.
+			 */
+			verify(nvlist_lookup_uint64(config,
+			    ZPOOL_CONFIG_POOL_GUID, &guid) == 0);
+
+			if (guid == searchguid)
+				found_config = config;
+		}
+	}
 
 	/*
-	 * If we're using the cachefile and we failed to import, then
-	 * fallback to scanning the directory for pools that match
-	 * those in the cachefile.
+	 * If we were searching for a specific pool, verify that we found a
+	 * pool, and then do the import.
 	 */
-	if (err != 0 && cachefile != NULL) {
-		(void) printf(gettext("cachefile import failed, retrying\n"));
-
-		/*
-		 * We use the scan flag to gather the directories that exist
-		 * in the cachefile. If we need to fallback to searching for
-		 * the pool config, we will only search devices in these
-		 * directories.
-		 */
-		idata.scan = B_TRUE;
-		nvlist_free(pools);
-		pools = zpool_search_import(g_zfs, &idata, &libzfs_config_ops);
-
-		err = import_pools(pools, props, mntopts, flags, argv[0],
-		    argc == 1 ? NULL : argv[1], do_destroyed, pool_specified,
-		    do_all, &idata);
+	if (argc != 0 && err == 0) {
+		if (found_config == NULL) {
+			(void) fprintf(stderr, gettext("cannot import '%s': "
+			    "no such pool available\n"), argv[0]);
+			err = B_TRUE;
+		} else {
+			err |= do_import(found_config, argc == 1 ? NULL :
+			    argv[1], mntopts, props, flags);
+		}
 	}
 
+	/*
+	 * If we were just looking for pools, report an error if none were
+	 * found.
+	 */
+	if (argc == 0 && first)
+		(void) fprintf(stderr,
+		    gettext("no pools available to import\n"));
+
 error:
 	nvlist_free(props);
 	nvlist_free(pools);
@@ -4915,8 +4852,8 @@ get_interval_count(int *argcp, char **argv, float *iv,
 
 		if (*end == '\0' && errno == 0) {
 			if (interval == 0) {
-				(void) fprintf(stderr, gettext(
-				    "interval cannot be zero\n"));
+				(void) fprintf(stderr, gettext("interval "
+				    "cannot be zero\n"));
 				usage(B_FALSE);
 			}
 			/*
@@ -4946,8 +4883,8 @@ get_interval_count(int *argcp, char **argv, float *iv,
 
 		if (*end == '\0' && errno == 0) {
 			if (interval == 0) {
-				(void) fprintf(stderr, gettext(
-				    "interval cannot be zero\n"));
+				(void) fprintf(stderr, gettext("interval "
+				    "cannot be zero\n"));
 				usage(B_FALSE);
 			}
 
@@ -5950,7 +5887,7 @@ print_one_column(zpool_prop_t prop, uint64_t value, const char *str,
 		break;
 	case ZPOOL_PROP_HEALTH:
 		width = 8;
-		(void) strlcpy(propval, str, sizeof (propval));
+		snprintf(propval, sizeof (propval), "%-*s", (int)width, str);
 		break;
 	default:
 		zfs_nicenum_format(value, propval, sizeof (propval), format);
@@ -7798,8 +7735,8 @@ print_removal_status(zpool_handle_t *zhp, pool_removal_stat_t *prs)
 		 * do not print estimated time if hours_left is more than
 		 * 30 days
 		 */
-		(void) printf(gettext(
-		    "\t%s copied out of %s at %s/s, %.2f%% done"),
+		(void) printf(gettext("    %s copied out of %s at %s/s, "
+		    "%.2f%% done"),
 		    examined_buf, total_buf, rate_buf, 100 * fraction_done);
 		if (hours_left < (30 * 24)) {
 			(void) printf(gettext(", %lluh%um to go\n"),
@@ -7814,8 +7751,8 @@ print_removal_status(zpool_handle_t *zhp, pool_removal_stat_t *prs)
 	if (prs->prs_mapping_memory > 0) {
 		char mem_buf[7];
 		zfs_nicenum(prs->prs_mapping_memory, mem_buf, sizeof (mem_buf));
-		(void) printf(gettext(
-		    "\t%s memory used for removed device mappings\n"),
+		(void) printf(gettext("    %s memory used for "
+		    "removed device mappings\n"),
 		    mem_buf);
 	}
 }

cmd/zstream/Makefile.am

@@ -13,5 +13,3 @@ zstream_LDADD = \
 	$(abs_top_builddir)/lib/libzfs/libzfs.la \
 	$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
 	$(abs_top_builddir)/lib/libnvpair/libnvpair.la
-
-include $(top_srcdir)/config/CppCheck.am

cmd/zstream/zstream_redup.c

@@ -248,7 +248,6 @@ zfs_redup_stream(int infd, int outfd, boolean_t verbose)
 			fflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);
 			fflags &= ~(DMU_BACKUP_FEATURE_DEDUP |
 			    DMU_BACKUP_FEATURE_DEDUPPROPS);
-			/* cppcheck-suppress syntaxError */
 			DMU_SET_FEATUREFLAGS(drrb->drr_versioninfo, fflags);
 
 			int sz = drr->drr_payloadlen;

cmd/ztest/Makefile.am

@@ -21,5 +21,3 @@ ztest_LDADD = \
 
 ztest_LDADD += -lm
 ztest_LDFLAGS = -pthread
-
-include $(top_srcdir)/config/CppCheck.am

cmd/ztest/ztest.c

@@ -132,7 +132,7 @@
 #include <libnvpair.h>
 #include <libzutil.h>
 #include <sys/crypto/icp.h>
-#if (__GLIBC__ && !__UCLIBC__)
+#ifdef __GLIBC__
 #include <execinfo.h> /* for backtrace() */
 #endif
 
@@ -556,7 +556,7 @@ dump_debug_buffer(void)
 static void sig_handler(int signo)
 {
 	struct sigaction action;
-#if (__GLIBC__ && !__UCLIBC__) /* backtrace() is a GNU extension */
+#ifdef __GLIBC__ /* backtrace() is a GNU extension */
 	int nptrs;
 	void *buffer[BACKTRACE_SZ];
 
@@ -2163,8 +2163,8 @@ ztest_get_done(zgd_t *zgd, int error)
 }
 
 static int
-ztest_get_data(void *arg, uint64_t arg2, lr_write_t *lr, char *buf,
-    struct lwb *lwb, zio_t *zio)
+ztest_get_data(void *arg, lr_write_t *lr, char *buf, struct lwb *lwb,
+    zio_t *zio)
 {
 	ztest_ds_t *zd = arg;
 	objset_t *os = zd->zd_os;

cmd/zvol_id/Makefile.am

@@ -8,5 +8,3 @@ udev_PROGRAMS = zvol_id
 
 zvol_id_SOURCES = \
 	zvol_id_main.c
-
-include $(top_srcdir)/config/CppCheck.am

config/CppCheck.am

@@ -1,11 +0,0 @@
-#
-# Default rules for running cppcheck against the the user space components.
-#
-
-PHONY += cppcheck
-
-CPPCHECKFLAGS  = --std=c99 --quiet --max-configs=1 --error-exitcode=2
-CPPCHECKFLAGS += --inline-suppr -U_KERNEL
-
-cppcheck:
-	$(CPPCHECK) -j$(CPU_COUNT) $(CPPCHECKFLAGS) $(DEFAULT_INCLUDES) $(SOURCES)

config/Rules.am

@@ -3,7 +3,6 @@
 # should include these rules and override or extend them as needed.
 #
 
-PHONY =
 DEFAULT_INCLUDES = \
 	-include $(top_builddir)/zfs_config.h \
 	-I$(top_builddir)/include \

config/always-cppcheck.m4

@@ -1,6 +0,0 @@
-dnl #
-dnl # Check if cppcheck is available.
-dnl #
-AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CPPCHECK], [
-	AC_CHECK_PROG([CPPCHECK], [cppcheck], [cppcheck])
-])

config/ax_count_cpus.m4

@@ -1,101 +0,0 @@
-# ===========================================================================
-#      https://www.gnu.org/software/autoconf-archive/ax_count_cpus.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_COUNT_CPUS([ACTION-IF-DETECTED],[ACTION-IF-NOT-DETECTED])
-#
-# DESCRIPTION
-#
-#   Attempt to count the number of logical processor cores (including
-#   virtual and HT cores) currently available to use on the machine and
-#   place detected value in CPU_COUNT variable.
-#
-#   On successful detection, ACTION-IF-DETECTED is executed if present. If
-#   the detection fails, then ACTION-IF-NOT-DETECTED is triggered. The
-#   default ACTION-IF-NOT-DETECTED is to set CPU_COUNT to 1.
-#
-# LICENSE
-#
-#   Copyright (c) 2014,2016 Karlson2k (Evgeny Grin) <k2k@narod.ru>
-#   Copyright (c) 2012 Brian Aker <brian@tangent.org>
-#   Copyright (c) 2008 Michael Paul Bailey <jinxidoru@byu.net>
-#   Copyright (c) 2008 Christophe Tournayre <turn3r@users.sourceforge.net>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 22
-
-  AC_DEFUN([AX_COUNT_CPUS],[dnl
-      AC_REQUIRE([AC_CANONICAL_HOST])dnl
-      AC_REQUIRE([AC_PROG_EGREP])dnl
-      AC_MSG_CHECKING([the number of available CPUs])
-      CPU_COUNT="0"
-
-      # Try generic methods
-
-      # 'getconf' is POSIX utility, but '_NPROCESSORS_ONLN' and
-      # 'NPROCESSORS_ONLN' are platform-specific
-      command -v getconf >/dev/null 2>&1 && \
-        CPU_COUNT=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null` || CPU_COUNT="0"
-      AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null || ! command -v nproc >/dev/null 2>&1]],[[: # empty]],[dnl
-        # 'nproc' is part of GNU Coreutils and is widely available
-        CPU_COUNT=`OMP_NUM_THREADS='' nproc 2>/dev/null` || CPU_COUNT=`nproc 2>/dev/null` || CPU_COUNT="0"
-      ])dnl
-
-      AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[: # empty]],[dnl
-        # Try platform-specific preferred methods
-        AS_CASE([[$host_os]],dnl
-          [[*linux*]],[[CPU_COUNT=`lscpu -p 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+,' -c` || CPU_COUNT="0"]],dnl
-          [[*darwin*]],[[CPU_COUNT=`sysctl -n hw.logicalcpu 2>/dev/null` || CPU_COUNT="0"]],dnl
-          [[freebsd*]],[[command -v sysctl >/dev/null 2>&1 && CPU_COUNT=`sysctl -n kern.smp.cpus 2>/dev/null` || CPU_COUNT="0"]],dnl
-          [[netbsd*]], [[command -v sysctl >/dev/null 2>&1 && CPU_COUNT=`sysctl -n hw.ncpuonline 2>/dev/null` || CPU_COUNT="0"]],dnl
-          [[solaris*]],[[command -v psrinfo >/dev/null 2>&1 && CPU_COUNT=`psrinfo 2>/dev/null | $EGREP -e '^@<:@0-9@:>@.*on-line' -c 2>/dev/null` || CPU_COUNT="0"]],dnl
-          [[mingw*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl
-          [[msys*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl
-          [[cygwin*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]]dnl
-        )dnl
-      ])dnl
-
-      AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null || ! command -v sysctl >/dev/null 2>&1]],[[: # empty]],[dnl
-        # Try less preferred generic method
-        # 'hw.ncpu' exist on many platforms, but not on GNU/Linux
-        CPU_COUNT=`sysctl -n hw.ncpu 2>/dev/null` || CPU_COUNT="0"
-      ])dnl
-
-      AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[: # empty]],[dnl
-      # Try platform-specific fallback methods
-      # They can be less accurate and slower then preferred methods
-        AS_CASE([[$host_os]],dnl
-          [[*linux*]],[[CPU_COUNT=`$EGREP -e '^processor' -c /proc/cpuinfo 2>/dev/null` || CPU_COUNT="0"]],dnl
-          [[*darwin*]],[[CPU_COUNT=`system_profiler SPHardwareDataType 2>/dev/null | $EGREP -i -e 'number of cores:'|cut -d : -f 2 -s|tr -d ' '` || CPU_COUNT="0"]],dnl
-          [[freebsd*]],[[CPU_COUNT=`dmesg 2>/dev/null| $EGREP -e '^cpu@<:@0-9@:>@+: '|sort -u|$EGREP -e '^' -c` || CPU_COUNT="0"]],dnl
-          [[netbsd*]], [[CPU_COUNT=`command -v cpuctl >/dev/null 2>&1 && cpuctl list 2>/dev/null| $EGREP -e '^@<:@0-9@:>@+ .* online ' -c` || \
-                           CPU_COUNT=`dmesg 2>/dev/null| $EGREP -e '^cpu@<:@0-9@:>@+ at'|sort -u|$EGREP -e '^' -c` || CPU_COUNT="0"]],dnl
-          [[solaris*]],[[command -v kstat >/dev/null 2>&1 && CPU_COUNT=`kstat -m cpu_info -s state -p 2>/dev/null | $EGREP -c -e 'on-line'` || \
-                           CPU_COUNT=`kstat -m cpu_info 2>/dev/null | $EGREP -c -e 'module: cpu_info'` || CPU_COUNT="0"]],dnl
-          [[mingw*]],[AS_IF([[CPU_COUNT=`reg query 'HKLM\\Hardware\\Description\\System\\CentralProcessor' 2>/dev/null | $EGREP -e '\\\\@<:@0-9@:>@+$' -c`]],dnl
-                        [[: # empty]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]])],dnl
-          [[msys*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]],dnl
-          [[cygwin*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]]dnl
-        )dnl
-      ])dnl
-
-      AS_IF([[test "x$CPU_COUNT" != "x0" && test "$CPU_COUNT" -gt 0 2>/dev/null]],[dnl
-          AC_MSG_RESULT([[$CPU_COUNT]])
-          m4_ifvaln([$1],[$1],)dnl
-        ],[dnl
-          m4_ifval([$2],[dnl
-            AS_UNSET([[CPU_COUNT]])
-            AC_MSG_RESULT([[unable to detect]])
-            $2
-          ], [dnl
-            CPU_COUNT="1"
-            AC_MSG_RESULT([[unable to detect (assuming 1)]])
-          ])dnl
-        ])dnl
-      ])dnl

config/kernel-acl.m4

@@ -189,22 +189,7 @@ dnl #
 dnl # 3.14 API change,
 dnl # Check if inode_operations contains the function set_acl
 dnl #
-dnl # 5.12 API change,
-dnl # set_acl() added a user_namespace* parameter first
-dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL], [
-	ZFS_LINUX_TEST_SRC([inode_operations_set_acl_userns], [
-		#include <linux/fs.h>
-
-		int set_acl_fn(struct user_namespace *userns,
-		    struct inode *inode, struct posix_acl *acl,
-		    int type) { return 0; }
-
-		static const struct inode_operations
-		    iops __attribute__ ((unused)) = {
-			.set_acl = set_acl_fn,
-		};
-	],[])
 	ZFS_LINUX_TEST_SRC([inode_operations_set_acl], [
 		#include <linux/fs.h>
 
@@ -220,17 +205,11 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL], [
 
 AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_SET_ACL], [
 	AC_MSG_CHECKING([whether iops->set_acl() exists])
-	ZFS_LINUX_TEST_RESULT([inode_operations_set_acl_userns], [
+	ZFS_LINUX_TEST_RESULT([inode_operations_set_acl], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SET_ACL, 1, [iops->set_acl() exists])
-		AC_DEFINE(HAVE_SET_ACL_USERNS, 1, [iops->set_acl() takes 4 args])
 	],[
-		ZFS_LINUX_TEST_RESULT([inode_operations_set_acl], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_SET_ACL, 1, [iops->set_acl() exists, takes 3 args])
-		],[
-			AC_MSG_RESULT(no)
-		])
+		AC_MSG_RESULT(no)
 	])
 ])
 

config/kernel-bio.m4

@@ -369,33 +369,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKG_TRYGET], [
 	])
 ])
 
-dnl #
-dnl # Linux 5.12 API,
-dnl #
-dnl # The Linux 5.12 kernel updated struct bio to create a new bi_bdev member
-dnl # and bio->bi_disk was moved to bio->bi_bdev->bd_disk
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_BDEV_DISK], [
-	ZFS_LINUX_TEST_SRC([bio_bdev_disk], [
-		#include <linux/blk_types.h>
-		#include <linux/blkdev.h>
-	],[
-		struct bio *b = NULL;
-		struct gendisk *d = b->bi_bdev->bd_disk;
-		blk_register_queue(d);
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_BIO_BDEV_DISK], [
-	AC_MSG_CHECKING([whether bio->bi_bdev->bd_disk exists])
-	ZFS_LINUX_TEST_RESULT([bio_bdev_disk], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BIO_BDEV_DISK, 1, [bio->bi_bdev->bd_disk exists])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
 AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO], [
 	ZFS_AC_KERNEL_SRC_REQ
 	ZFS_AC_KERNEL_SRC_BIO_OPS
@@ -406,7 +379,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO], [
 	ZFS_AC_KERNEL_SRC_BIO_SUBMIT_BIO
 	ZFS_AC_KERNEL_SRC_BIO_CURRENT_BIO_LIST
 	ZFS_AC_KERNEL_SRC_BLKG_TRYGET
-	ZFS_AC_KERNEL_SRC_BIO_BDEV_DISK
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_BIO], [
@@ -428,5 +400,4 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO], [
 	ZFS_AC_KERNEL_BIO_SUBMIT_BIO
 	ZFS_AC_KERNEL_BIO_CURRENT_BIO_LIST
 	ZFS_AC_KERNEL_BLKG_TRYGET
-	ZFS_AC_KERNEL_BIO_BDEV_DISK
 ])

config/kernel-bio_max_segs.m4

@@ -1,23 +0,0 @@
-dnl #
-dnl # 5.12 API change removes BIO_MAX_PAGES in favor of bio_max_segs()
-dnl # which will handle the logic of setting the upper-bound to a
-dnl # BIO_MAX_PAGES, internally.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_MAX_SEGS], [
-	ZFS_LINUX_TEST_SRC([bio_max_segs], [
-		#include <linux/bio.h>
-	],[
-		bio_max_segs(1);
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_BIO_MAX_SEGS], [
-	AC_MSG_CHECKING([whether bio_max_segs() exists])
-	ZFS_LINUX_TEST_RESULT([bio_max_segs], [
-		AC_MSG_RESULT(yes)
-
-		AC_DEFINE([HAVE_BIO_MAX_SEGS], 1, [bio_max_segs() is implemented])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])

config/kernel-block-device-operations.m4

@@ -52,44 +52,12 @@ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
 	])
 ])
 
-dnl #
-dnl # 5.13 API change
-dnl # block_device_operations->revalidate_disk() was removed
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [
-	ZFS_LINUX_TEST_SRC([block_device_operations_revalidate_disk], [
-		#include <linux/blkdev.h>
-
-		int blk_revalidate_disk(struct gendisk *disk) {
-			return(0);
-		}
-
-		static const struct block_device_operations
-		    bops __attribute__ ((unused)) = {
-			.revalidate_disk	= blk_revalidate_disk,
-		};
-	], [], [$NO_UNUSED_BUT_SET_VARIABLE])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [
-	AC_MSG_CHECKING([whether bops->revalidate_disk() exists])
-	ZFS_LINUX_TEST_RESULT([block_device_operations_revalidate_disk], [
-		AC_DEFINE([HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [1],
-			[Define if revalidate_disk() in block_device_operations])
-		AC_MSG_RESULT(yes)
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
 AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS], [
 	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS
 	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
-	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS], [
 	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS
 	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
-	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK
 ])

config/kernel-generic_fillattr.m4

@@ -1,28 +0,0 @@
-dnl #
-dnl # 5.12 API
-dnl #
-dnl # generic_fillattr in linux/fs.h now requires a struct user_namespace*
-dnl # as the first arg, to support idmapped mounts.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_FILLATTR_USERNS], [
-	ZFS_LINUX_TEST_SRC([generic_fillattr_userns], [
-		#include <linux/fs.h>
-	],[
-		struct user_namespace *userns = NULL;
-		struct inode *in = NULL;
-		struct kstat *k = NULL;
-		generic_fillattr(userns, in, k);
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_GENERIC_FILLATTR_USERNS], [
-	AC_MSG_CHECKING([whether generic_fillattr requres struct user_namespace*])
-	ZFS_LINUX_TEST_RESULT([generic_fillattr_userns], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_GENERIC_FILLATTR_USERNS, 1,
-		    [generic_fillattr requires struct user_namespace*])
-	],[
-		AC_MSG_RESULT([no])
-	])
-])
-

config/kernel-generic_io_acct.m4

@@ -2,17 +2,6 @@ dnl #
 dnl # Check for generic io accounting interface.
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT], [
-	ZFS_LINUX_TEST_SRC([disk_io_acct], [
-		#include <linux/blkdev.h>
-	], [
-		struct gendisk *disk = NULL;
-		struct bio *bio = NULL;
-		unsigned long start_time;
-
-		start_time = disk_start_io_acct(disk, bio_sectors(bio), bio_op(bio));
-		disk_end_io_acct(disk, bio_op(bio), start_time);
-	])
-
 	ZFS_LINUX_TEST_SRC([bio_io_acct], [
 		#include <linux/blkdev.h>
 	], [
@@ -50,62 +39,48 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT], [
 
 AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT], [
 	dnl #
-	dnl # 5.12 API,
+	dnl # 5.7 API,
 	dnl #
-	dnl # bio_start_io_acct() and bio_end_io_acct() became GPL-exported
-	dnl # so use disk_start_io_acct() and disk_end_io_acct() instead
+	dnl # Added bio_start_io_acct() and bio_end_io_acct() helpers.
 	dnl #
-	AC_MSG_CHECKING([whether generic disk_*_io_acct() are available])
-	ZFS_LINUX_TEST_RESULT([disk_io_acct], [
+	AC_MSG_CHECKING([whether generic bio_*_io_acct() are available])
+	ZFS_LINUX_TEST_RESULT([bio_io_acct], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_DISK_IO_ACCT, 1, [disk_*_io_acct() available])
+		AC_DEFINE(HAVE_BIO_IO_ACCT, 1, [bio_*_io_acct() available])
 	], [
 		AC_MSG_RESULT(no)
 
 		dnl #
-		dnl # 5.7 API,
+		dnl # 4.14 API,
 		dnl #
-		dnl # Added bio_start_io_acct() and bio_end_io_acct() helpers.
+		dnl # generic_start_io_acct/generic_end_io_acct now require
+		dnl # request_queue to be provided. No functional changes,
+		dnl # but preparation for inflight accounting.
 		dnl #
-		AC_MSG_CHECKING([whether generic bio_*_io_acct() are available])
-		ZFS_LINUX_TEST_RESULT([bio_io_acct], [
+		AC_MSG_CHECKING([whether generic_*_io_acct wants 4 args])
+		ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_4args],
+		    [generic_start_io_acct], [block/bio.c], [
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_BIO_IO_ACCT, 1, [bio_*_io_acct() available])
+			AC_DEFINE(HAVE_GENERIC_IO_ACCT_4ARG, 1,
+			    [generic_*_io_acct() 4 arg available])
 		], [
 			AC_MSG_RESULT(no)
 
 			dnl #
-			dnl # 4.14 API,
+			dnl # 3.19 API addition
 			dnl #
-			dnl # generic_start_io_acct/generic_end_io_acct now require
-			dnl # request_queue to be provided. No functional changes,
-			dnl # but preparation for inflight accounting.
+			dnl # torvalds/linux@394ffa50 allows us to increment
+			dnl # iostat counters without generic_make_request().
 			dnl #
-			AC_MSG_CHECKING([whether generic_*_io_acct wants 4 args])
-			ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_4args],
+			AC_MSG_CHECKING(
+			    [whether generic_*_io_acct wants 3 args])
+			ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_3args],
 			    [generic_start_io_acct], [block/bio.c], [
 				AC_MSG_RESULT(yes)
-				AC_DEFINE(HAVE_GENERIC_IO_ACCT_4ARG, 1,
-				    [generic_*_io_acct() 4 arg available])
+				AC_DEFINE(HAVE_GENERIC_IO_ACCT_3ARG, 1,
+				    [generic_*_io_acct() 3 arg available])
 			], [
 				AC_MSG_RESULT(no)
-
-				dnl #
-				dnl # 3.19 API addition
-				dnl #
-				dnl # torvalds/linux@394ffa50 allows us to increment
-				dnl # iostat counters without generic_make_request().
-				dnl #
-				AC_MSG_CHECKING(
-				    [whether generic_*_io_acct wants 3 args])
-				ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_3args],
-				    [generic_start_io_acct], [block/bio.c], [
-					AC_MSG_RESULT(yes)
-					AC_DEFINE(HAVE_GENERIC_IO_ACCT_3ARG, 1,
-					    [generic_*_io_acct() 3 arg available])
-				], [
-					AC_MSG_RESULT(no)
-				])
 			])
 		])
 	])

config/kernel-inode-create.m4

@@ -1,25 +1,7 @@
-AC_DEFUN([ZFS_AC_KERNEL_SRC_CREATE], [
-	dnl #
-	dnl # 5.12 API change that added the struct user_namespace* arg
-	dnl # to the front of this function type's arg list.
-	dnl #
-	ZFS_LINUX_TEST_SRC([create_userns], [
-		#include <linux/fs.h>
-		#include <linux/sched.h>
-
-		int inode_create(struct user_namespace *userns,
-		    struct inode *inode ,struct dentry *dentry,
-		    umode_t umode, bool flag) { return 0; }
-
-		static const struct inode_operations
-			iops __attribute__ ((unused)) = {
-			.create		= inode_create,
-		};
-	],[])
-
-	dnl #
-	dnl # 3.6 API change
-	dnl #
+dnl #
+dnl # 3.6 API change
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CREATE_FLAGS], [
 	ZFS_LINUX_TEST_SRC([create_flags], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>
@@ -34,20 +16,11 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_CREATE], [
 	],[])
 ])
 
-AC_DEFUN([ZFS_AC_KERNEL_CREATE], [
-	AC_MSG_CHECKING([whether iops->create() takes struct user_namespace*])
-	ZFS_LINUX_TEST_RESULT([create_userns], [
+AC_DEFUN([ZFS_AC_KERNEL_CREATE_FLAGS], [
+	AC_MSG_CHECKING([whether iops->create() passes flags])
+	ZFS_LINUX_TEST_RESULT([create_flags], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_IOPS_CREATE_USERNS, 1,
-		   [iops->create() takes struct user_namespace*])
 	],[
-		AC_MSG_RESULT(no)
-
-		AC_MSG_CHECKING([whether iops->create() passes flags])
-		ZFS_LINUX_TEST_RESULT([create_flags], [
-			AC_MSG_RESULT(yes)
-		],[
-			ZFS_LINUX_TEST_ERROR([iops->create()])
-		])
+		ZFS_LINUX_TEST_ERROR([iops->create()])
 	])
 ])

config/kernel-inode-getattr.m4

@@ -1,29 +1,8 @@
+dnl #
+dnl # Linux 4.11 API
+dnl # See torvalds/linux@a528d35
+dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_GETATTR], [
-	dnl #
-	dnl # Linux 5.12 API
-	dnl # The getattr I/O operations handler type was extended to require
-	dnl # a struct user_namespace* as its first arg, to support idmapped
-	dnl # mounts.
-	dnl #
-	ZFS_LINUX_TEST_SRC([inode_operations_getattr_userns], [
-		#include <linux/fs.h>
-
-		int test_getattr(
-			struct user_namespace *userns,
-		    const struct path *p, struct kstat *k,
-		    u32 request_mask, unsigned int query_flags)
-		    { return 0; }
-
-		static const struct inode_operations
-		    iops __attribute__ ((unused)) = {
-			.getattr = test_getattr,
-		};
-	],[])
-
-	dnl #
-	dnl # Linux 4.11 API
-	dnl # See torvalds/linux@a528d35
-	dnl #
 	ZFS_LINUX_TEST_SRC([inode_operations_getattr_path], [
 		#include <linux/fs.h>
 
@@ -54,39 +33,21 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_GETATTR], [
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_INODE_GETATTR], [
-	dnl #
-	dnl # Kernel 5.12 test
-	dnl #
-	AC_MSG_CHECKING([whether iops->getattr() takes user_namespace])
-	ZFS_LINUX_TEST_RESULT([inode_operations_getattr_userns], [
+	AC_MSG_CHECKING([whether iops->getattr() takes a path])
+	ZFS_LINUX_TEST_RESULT([inode_operations_getattr_path], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_USERNS_IOPS_GETATTR, 1,
-		    [iops->getattr() takes struct user_namespace*])
+		AC_DEFINE(HAVE_PATH_IOPS_GETATTR, 1,
+		    [iops->getattr() takes a path])
 	],[
 		AC_MSG_RESULT(no)
 
-		dnl #
-		dnl # Kernel 4.11 test
-		dnl #
-		AC_MSG_CHECKING([whether iops->getattr() takes a path])
-		ZFS_LINUX_TEST_RESULT([inode_operations_getattr_path], [
+		AC_MSG_CHECKING([whether iops->getattr() takes a vfsmount])
+		ZFS_LINUX_TEST_RESULT([inode_operations_getattr_vfsmount], [
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_PATH_IOPS_GETATTR, 1,
-				[iops->getattr() takes a path])
+			AC_DEFINE(HAVE_VFSMOUNT_IOPS_GETATTR, 1,
+			    [iops->getattr() takes a vfsmount])
 		],[
 			AC_MSG_RESULT(no)
-
-			dnl #
-			dnl # Kernel < 4.11 test
-			dnl #
-			AC_MSG_CHECKING([whether iops->getattr() takes a vfsmount])
-			ZFS_LINUX_TEST_RESULT([inode_operations_getattr_vfsmount], [
-				AC_MSG_RESULT(yes)
-				AC_DEFINE(HAVE_VFSMOUNT_IOPS_GETATTR, 1,
-					[iops->getattr() takes a vfsmount])
-			],[
-				AC_MSG_RESULT(no)
-			])
 		])
 	])
 ])

config/kernel-is_owner_or_cap.m4

@@ -11,32 +11,13 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OWNER_OR_CAPABLE], [
 		struct inode *ip = NULL;
 		(void) inode_owner_or_capable(ip);
 	])
-
-	ZFS_LINUX_TEST_SRC([inode_owner_or_capable_idmapped], [
-		#include <linux/fs.h>
-	],[
-		struct inode *ip = NULL;
-		(void) inode_owner_or_capable(&init_user_ns, ip);
-	])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_INODE_OWNER_OR_CAPABLE], [
 	AC_MSG_CHECKING([whether inode_owner_or_capable() exists])
 	ZFS_LINUX_TEST_RESULT([inode_owner_or_capable], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_INODE_OWNER_OR_CAPABLE, 1,
-		    [inode_owner_or_capable() exists])
-	], [
-		AC_MSG_RESULT(no)
-
-		AC_MSG_CHECKING(
-		    [whether inode_owner_or_capable() takes user_ns])
-		ZFS_LINUX_TEST_RESULT([inode_owner_or_capable_idmapped], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_INODE_OWNER_OR_CAPABLE_IDMAPPED, 1,
-			    [inode_owner_or_capable() takes user_ns])
-		],[
-			ZFS_LINUX_TEST_ERROR([capability])
-		])
+	],[
+		ZFS_LINUX_TEST_ERROR([capability])
 	])
 ])

config/kernel-mkdir-umode-t.m4

@@ -0,0 +1,32 @@
+dnl #
+dnl # 3.3 API change
+dnl # The VFS .create, .mkdir and .mknod callbacks were updated to take a
+dnl # umode_t type rather than an int.  The expectation is that any backport
+dnl # would also change all three prototypes.  However, if it turns out that
+dnl # some distribution doesn't backport the whole thing this could be
+dnl # broken apart into three separate checks.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_MKDIR_UMODE_T], [
+	ZFS_LINUX_TEST_SRC([inode_operations_mkdir], [
+		#include <linux/fs.h>
+
+		int mkdir(struct inode *inode, struct dentry *dentry,
+		    umode_t umode) { return 0; }
+
+		static const struct inode_operations
+		    iops __attribute__ ((unused)) = {
+			.mkdir = mkdir,
+		};
+	],[])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_MKDIR_UMODE_T], [
+	AC_MSG_CHECKING([whether iops->create()/mkdir()/mknod() take umode_t])
+	ZFS_LINUX_TEST_RESULT([inode_operations_mkdir], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_MKDIR_UMODE_T, 1,
+		    [iops->create()/mkdir()/mknod() take umode_t])
+	],[
+		ZFS_LINUX_TEST_ERROR([mkdir()])
+	])
+])

config/kernel-mkdir.m4

@@ -1,65 +0,0 @@
-dnl #
-dnl # Supported mkdir() interfaces checked newest to oldest.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_MKDIR], [
-	dnl #
-	dnl # 5.12 API change
-	dnl # The struct user_namespace arg was added as the first argument to
-	dnl # mkdir()
-	dnl #
-	ZFS_LINUX_TEST_SRC([mkdir_user_namespace], [
-		#include <linux/fs.h>
-
-		int mkdir(struct user_namespace *userns,
-			struct inode *inode, struct dentry *dentry,
-		    umode_t umode) { return 0; }
-
-		static const struct inode_operations
-		    iops __attribute__ ((unused)) = {
-			.mkdir = mkdir,
-		};
-	],[])
-
-	dnl #
-	dnl # 3.3 API change
-	dnl # The VFS .create, .mkdir and .mknod callbacks were updated to take a
-	dnl # umode_t type rather than an int.  The expectation is that any backport
-	dnl # would also change all three prototypes.  However, if it turns out that
-	dnl # some distribution doesn't backport the whole thing this could be
-	dnl # broken apart into three separate checks.
-	dnl #
-	ZFS_LINUX_TEST_SRC([inode_operations_mkdir], [
-		#include <linux/fs.h>
-
-		int mkdir(struct inode *inode, struct dentry *dentry,
-		    umode_t umode) { return 0; }
-
-		static const struct inode_operations
-		    iops __attribute__ ((unused)) = {
-			.mkdir = mkdir,
-		};
-	],[])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_MKDIR], [
-	dnl #
-	dnl # 5.12 API change
-	dnl # The struct user_namespace arg was added as the first argument to
-	dnl # mkdir() of the iops structure.
-	dnl #
-	AC_MSG_CHECKING([whether iops->mkdir() takes struct user_namespace*])
-	ZFS_LINUX_TEST_RESULT([mkdir_user_namespace], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_IOPS_MKDIR_USERNS, 1,
-		    [iops->mkdir() takes struct user_namespace*])
-	],[
-		AC_MSG_CHECKING([whether iops->mkdir() takes umode_t])
-		ZFS_LINUX_TEST_RESULT([inode_operations_mkdir], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_MKDIR_UMODE_T, 1,
-			    [iops->mkdir() takes umode_t])
-		],[
-			ZFS_LINUX_TEST_ERROR([mkdir()])
-		])
-	])
-])

config/kernel-mknod.m4

@@ -1,30 +0,0 @@
-AC_DEFUN([ZFS_AC_KERNEL_SRC_MKNOD], [
-	dnl #
-	dnl # 5.12 API change that added the struct user_namespace* arg
-	dnl # to the front of this function type's arg list.
-	dnl #
-	ZFS_LINUX_TEST_SRC([mknod_userns], [
-		#include <linux/fs.h>
-		#include <linux/sched.h>
-
-		int tmp_mknod(struct user_namespace *userns,
-		    struct inode *inode ,struct dentry *dentry,
-		    umode_t u, dev_t d) { return 0; }
-
-		static const struct inode_operations
-			iops __attribute__ ((unused)) = {
-			.mknod		= tmp_mknod,
-		};
-	],[])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_MKNOD], [
-	AC_MSG_CHECKING([whether iops->mknod() takes struct user_namespace*])
-	ZFS_LINUX_TEST_RESULT([mknod_userns], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_IOPS_MKNOD_USERNS, 1,
-		    [iops->mknod() takes struct user_namespace*])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])

config/kernel-rename.m4

@@ -1,10 +1,10 @@
-AC_DEFUN([ZFS_AC_KERNEL_SRC_RENAME], [
-	dnl #
-	dnl # 4.9 API change,
-	dnl # iops->rename2() merged into iops->rename(), and iops->rename() now wants
-	dnl # flags.
-	dnl #
-	ZFS_LINUX_TEST_SRC([inode_operations_rename_flags], [
+dnl #
+dnl # 4.9 API change,
+dnl # iops->rename2() merged into iops->rename(), and iops->rename() now wants
+dnl # flags.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_RENAME_WANTS_FLAGS], [
+	ZFS_LINUX_TEST_SRC([inode_operations_rename], [
 		#include <linux/fs.h>
 		int rename_fn(struct inode *sip, struct dentry *sdp,
 			struct inode *tip, struct dentry *tdp,
@@ -15,41 +15,15 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_RENAME], [
 			.rename = rename_fn,
 		};
 	],[])
-
-	dnl #
-	dnl # 5.12 API change,
-	dnl #
-	dnl # Linux 5.12 introduced passing struct user_namespace* as the first argument
-	dnl # of the rename() and other inode_operations members.
-	dnl #
-	ZFS_LINUX_TEST_SRC([inode_operations_rename_userns], [
-		#include <linux/fs.h>
-		int rename_fn(struct user_namespace *user_ns, struct inode *sip,
-			struct dentry *sdp, struct inode *tip, struct dentry *tdp,
-			unsigned int flags) { return 0; }
-
-		static const struct inode_operations
-		    iops __attribute__ ((unused)) = {
-			.rename = rename_fn,
-		};
-	],[])
 ])
 
-AC_DEFUN([ZFS_AC_KERNEL_RENAME], [
-	AC_MSG_CHECKING([whether iops->rename() takes struct user_namespace*])
-	ZFS_LINUX_TEST_RESULT([inode_operations_rename_userns], [
+AC_DEFUN([ZFS_AC_KERNEL_RENAME_WANTS_FLAGS], [
+	AC_MSG_CHECKING([whether iops->rename() wants flags])
+	ZFS_LINUX_TEST_RESULT([inode_operations_rename], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_IOPS_RENAME_USERNS, 1,
-		    [iops->rename() takes struct user_namespace*])
+		AC_DEFINE(HAVE_RENAME_WANTS_FLAGS, 1,
+		    [iops->rename() wants flags])
 	],[
 		AC_MSG_RESULT(no)
-
-		ZFS_LINUX_TEST_RESULT([inode_operations_rename_flags], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_RENAME_WANTS_FLAGS, 1,
-				[iops->rename() wants flags])
-		],[
-			AC_MSG_RESULT(no)
-		])
 	])
 ])

config/kernel-setattr-prepare.m4

@@ -1,52 +1,27 @@
+dnl #
+dnl # 4.9 API change
+dnl # The inode_change_ok() function has been renamed setattr_prepare()
+dnl # and updated to take a dentry rather than an inode.
+dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_SETATTR_PREPARE], [
-	dnl #
-	dnl # 4.9 API change
-	dnl # The inode_change_ok() function has been renamed setattr_prepare()
-	dnl # and updated to take a dentry rather than an inode.
-	dnl #
 	ZFS_LINUX_TEST_SRC([setattr_prepare], [
 		#include <linux/fs.h>
 	], [
 		struct dentry *dentry = NULL;
 		struct iattr *attr = NULL;
 		int error __attribute__ ((unused)) =
-			setattr_prepare(dentry, attr);
-	])
-
-	dnl #
-	dnl # 5.12 API change
-	dnl # The setattr_prepare() function has been changed to accept a new argument
-	dnl # for struct user_namespace*
-	dnl #
-	ZFS_LINUX_TEST_SRC([setattr_prepare_userns], [
-		#include <linux/fs.h>
-	], [
-		struct dentry *dentry = NULL;
-		struct iattr *attr = NULL;
-		struct user_namespace *userns = NULL;
-		int error __attribute__ ((unused)) =
-			setattr_prepare(userns, dentry, attr);
+		    setattr_prepare(dentry, attr);
 	])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_SETATTR_PREPARE], [
-	AC_MSG_CHECKING([whether setattr_prepare() is available and accepts struct user_namespace*])
-	ZFS_LINUX_TEST_RESULT_SYMBOL([setattr_prepare_userns],
+	AC_MSG_CHECKING([whether setattr_prepare() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([setattr_prepare],
 	    [setattr_prepare], [fs/attr.c], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SETATTR_PREPARE_USERNS, 1,
-		    [setattr_prepare() accepts user_namespace])
+		AC_DEFINE(HAVE_SETATTR_PREPARE, 1,
+		    [setattr_prepare() is available])
 	], [
 		AC_MSG_RESULT(no)
-
-		AC_MSG_CHECKING([whether setattr_prepare() is available, doesn't accept user_namespace])
-		ZFS_LINUX_TEST_RESULT_SYMBOL([setattr_prepare],
-			[setattr_prepare], [fs/attr.c], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_SETATTR_PREPARE_NO_USERNS, 1,
-				[setattr_prepare() is available, doesn't accept user_namespace])
-		], [
-			AC_MSG_RESULT(no)
-		])
 	])
 ])

config/kernel-symlink.m4

@@ -1,30 +0,0 @@
-AC_DEFUN([ZFS_AC_KERNEL_SRC_SYMLINK], [
-	dnl #
-	dnl # 5.12 API change that added the struct user_namespace* arg
-	dnl # to the front of this function type's arg list.
-	dnl #
-	ZFS_LINUX_TEST_SRC([symlink_userns], [
-		#include <linux/fs.h>
-		#include <linux/sched.h>
-
-		int tmp_symlink(struct user_namespace *userns,
-		    struct inode *inode ,struct dentry *dentry,
-		    const char *path) { return 0; }
-
-		static const struct inode_operations
-			iops __attribute__ ((unused)) = {
-			.symlink		= tmp_symlink,
-		};
-	],[])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_SYMLINK], [
-	AC_MSG_CHECKING([whether iops->symlink() takes struct user_namespace*])
-	ZFS_LINUX_TEST_RESULT([symlink_userns], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_IOPS_SYMLINK_USERNS, 1,
-		    [iops->symlink() takes struct user_namespace*])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])

config/kernel-tmpfile.m4

@@ -3,43 +3,23 @@ dnl # 3.11 API change
 dnl # Add support for i_op->tmpfile
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [
-	dnl #
-	dnl # 5.11 API change
-	dnl # add support for userns parameter to tmpfile
-	dnl #
-	ZFS_LINUX_TEST_SRC([inode_operations_tmpfile_userns], [
+	ZFS_LINUX_TEST_SRC([inode_operations_tmpfile], [
 		#include <linux/fs.h>
-		int tmpfile(struct user_namespace *userns,
-		    struct inode *inode, struct dentry *dentry,
+		int tmpfile(struct inode *inode, struct dentry *dentry,
 		    umode_t mode) { return 0; }
 		static struct inode_operations
 		    iops __attribute__ ((unused)) = {
 			.tmpfile = tmpfile,
 		};
 	],[])
-	ZFS_LINUX_TEST_SRC([inode_operations_tmpfile], [
-			#include <linux/fs.h>
-			int tmpfile(struct inode *inode, struct dentry *dentry,
-			    umode_t mode) { return 0; }
-			static struct inode_operations
-			    iops __attribute__ ((unused)) = {
-				.tmpfile = tmpfile,
-			};
-	],[])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_TMPFILE], [
 	AC_MSG_CHECKING([whether i_op->tmpfile() exists])
-	ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile_userns], [
+	ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_TMPFILE, 1, [i_op->tmpfile() exists])
-		AC_DEFINE(HAVE_TMPFILE_USERNS, 1, [i_op->tmpfile() has userns])
 	],[
-		ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_TMPFILE, 1, [i_op->tmpfile() exists])
-		],[
-			AC_MSG_RESULT(no)
-		])
+		AC_MSG_RESULT(no)
 	])
 ])

config/kernel-xattr-handler.m4

@@ -152,21 +152,6 @@ dnl #
 dnl # Supported xattr handler set() interfaces checked newest to oldest.
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_SET], [
-	ZFS_LINUX_TEST_SRC([xattr_handler_set_userns], [
-		#include <linux/xattr.h>
-
-		int set(const struct xattr_handler *handler,
-			struct user_namespace *mnt_userns,
-			struct dentry *dentry, struct inode *inode,
-			const char *name, const void *buffer,
-			size_t size, int flags)
-			{ return 0; }
-		static const struct xattr_handler
-			xops __attribute__ ((unused)) = {
-			.set = set,
-		};
-	],[])
-
 	ZFS_LINUX_TEST_SRC([xattr_handler_set_dentry_inode], [
 		#include <linux/xattr.h>
 
@@ -209,58 +194,45 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_SET], [
 
 AC_DEFUN([ZFS_AC_KERNEL_XATTR_HANDLER_SET], [
 	dnl #
-	dnl # 5.12 API change,
-	dnl # The xattr_handler->set() callback was changed to 8 arguments, and
-	dnl # struct user_namespace* was inserted as arg #2
+	dnl # 4.7 API change,
+	dnl # The xattr_handler->set() callback was changed to take both
+	dnl # dentry and inode.
 	dnl #
-	AC_MSG_CHECKING([whether xattr_handler->set() wants dentry, inode, and user_namespace])
-	ZFS_LINUX_TEST_RESULT([xattr_handler_set_userns], [
+	AC_MSG_CHECKING([whether xattr_handler->set() wants dentry and inode])
+	ZFS_LINUX_TEST_RESULT([xattr_handler_set_dentry_inode], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_XATTR_SET_USERNS, 1,
-		    [xattr_handler->set() takes user_namespace])
+		AC_DEFINE(HAVE_XATTR_SET_DENTRY_INODE, 1,
+		    [xattr_handler->set() wants both dentry and inode])
 	],[
 		dnl #
-		dnl # 4.7 API change,
-		dnl # The xattr_handler->set() callback was changed to take both
-		dnl # dentry and inode.
+		dnl # 4.4 API change,
+		dnl # The xattr_handler->set() callback was changed to take a
+		dnl # xattr_handler, and handler_flags argument was removed and
+		dnl # should be accessed by handler->flags.
 		dnl #
 		AC_MSG_RESULT(no)
-		AC_MSG_CHECKING([whether xattr_handler->set() wants dentry and inode])
-		ZFS_LINUX_TEST_RESULT([xattr_handler_set_dentry_inode], [
+		AC_MSG_CHECKING(
+		    [whether xattr_handler->set() wants xattr_handler])
+		ZFS_LINUX_TEST_RESULT([xattr_handler_set_xattr_handler], [
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_XATTR_SET_DENTRY_INODE, 1,
-			    [xattr_handler->set() wants both dentry and inode])
+			AC_DEFINE(HAVE_XATTR_SET_HANDLER, 1,
+			    [xattr_handler->set() wants xattr_handler])
 		],[
 			dnl #
-			dnl # 4.4 API change,
-			dnl # The xattr_handler->set() callback was changed to take a
-			dnl # xattr_handler, and handler_flags argument was removed and
-			dnl # should be accessed by handler->flags.
+			dnl # 2.6.33 API change,
+			dnl # The xattr_handler->set() callback was changed
+			dnl # to take a dentry instead of an inode, and a
+			dnl # handler_flags argument was added.
 			dnl #
 			AC_MSG_RESULT(no)
 			AC_MSG_CHECKING(
-			    [whether xattr_handler->set() wants xattr_handler])
-			ZFS_LINUX_TEST_RESULT([xattr_handler_set_xattr_handler], [
+			    [whether xattr_handler->set() wants dentry])
+			ZFS_LINUX_TEST_RESULT([xattr_handler_set_dentry], [
 				AC_MSG_RESULT(yes)
-				AC_DEFINE(HAVE_XATTR_SET_HANDLER, 1,
-				    [xattr_handler->set() wants xattr_handler])
+				AC_DEFINE(HAVE_XATTR_SET_DENTRY, 1,
+				    [xattr_handler->set() wants dentry])
 			],[
-				dnl #
-				dnl # 2.6.33 API change,
-				dnl # The xattr_handler->set() callback was changed
-				dnl # to take a dentry instead of an inode, and a
-				dnl # handler_flags argument was added.
-				dnl #
-				AC_MSG_RESULT(no)
-				AC_MSG_CHECKING(
-				    [whether xattr_handler->set() wants dentry])
-				ZFS_LINUX_TEST_RESULT([xattr_handler_set_dentry], [
-					AC_MSG_RESULT(yes)
-					AC_DEFINE(HAVE_XATTR_SET_DENTRY, 1,
-					    [xattr_handler->set() wants dentry])
-				],[
-					ZFS_LINUX_TEST_ERROR([xattr set()])
-				])
+				ZFS_LINUX_TEST_ERROR([xattr set()])
 			])
 		])
 	])

config/kernel.m4

@@ -79,9 +79,9 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_EVICT_INODE
 	ZFS_AC_KERNEL_SRC_DIRTY_INODE
 	ZFS_AC_KERNEL_SRC_SHRINKER
-	ZFS_AC_KERNEL_SRC_MKDIR
+	ZFS_AC_KERNEL_SRC_MKDIR_UMODE_T
 	ZFS_AC_KERNEL_SRC_LOOKUP_FLAGS
-	ZFS_AC_KERNEL_SRC_CREATE
+	ZFS_AC_KERNEL_SRC_CREATE_FLAGS
 	ZFS_AC_KERNEL_SRC_GET_LINK
 	ZFS_AC_KERNEL_SRC_PUT_LINK
 	ZFS_AC_KERNEL_SRC_TMPFILE
@@ -115,7 +115,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_KUIDGID_T
 	ZFS_AC_KERNEL_SRC_KUID_HELPERS
 	ZFS_AC_KERNEL_SRC_MODULE_PARAM_CALL_CONST
-	ZFS_AC_KERNEL_SRC_RENAME
+	ZFS_AC_KERNEL_SRC_RENAME_WANTS_FLAGS
 	ZFS_AC_KERNEL_SRC_CURRENT_TIME
 	ZFS_AC_KERNEL_SRC_USERNS_CAPABILITIES
 	ZFS_AC_KERNEL_SRC_IN_COMPAT_SYSCALL
@@ -124,10 +124,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_TOTALHIGH_PAGES
 	ZFS_AC_KERNEL_SRC_KSTRTOUL
 	ZFS_AC_KERNEL_SRC_PERCPU
-	ZFS_AC_KERNEL_SRC_GENERIC_FILLATTR_USERNS
-	ZFS_AC_KERNEL_SRC_MKNOD
-	ZFS_AC_KERNEL_SRC_SYMLINK
-	ZFS_AC_KERNEL_SRC_BIO_MAX_SEGS
 
 	AC_MSG_CHECKING([for available kernel interfaces])
 	ZFS_LINUX_TEST_COMPILE_ALL([kabi])
@@ -180,9 +176,9 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_EVICT_INODE
 	ZFS_AC_KERNEL_DIRTY_INODE
 	ZFS_AC_KERNEL_SHRINKER
-	ZFS_AC_KERNEL_MKDIR
+	ZFS_AC_KERNEL_MKDIR_UMODE_T
 	ZFS_AC_KERNEL_LOOKUP_FLAGS
-	ZFS_AC_KERNEL_CREATE
+	ZFS_AC_KERNEL_CREATE_FLAGS
 	ZFS_AC_KERNEL_GET_LINK
 	ZFS_AC_KERNEL_PUT_LINK
 	ZFS_AC_KERNEL_TMPFILE
@@ -216,7 +212,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_KUIDGID_T
 	ZFS_AC_KERNEL_KUID_HELPERS
 	ZFS_AC_KERNEL_MODULE_PARAM_CALL_CONST
-	ZFS_AC_KERNEL_RENAME
+	ZFS_AC_KERNEL_RENAME_WANTS_FLAGS
 	ZFS_AC_KERNEL_CURRENT_TIME
 	ZFS_AC_KERNEL_USERNS_CAPABILITIES
 	ZFS_AC_KERNEL_IN_COMPAT_SYSCALL
@@ -225,10 +221,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_TOTALHIGH_PAGES
 	ZFS_AC_KERNEL_KSTRTOUL
 	ZFS_AC_KERNEL_PERCPU
-	ZFS_AC_KERNEL_GENERIC_FILLATTR_USERNS
-	ZFS_AC_KERNEL_MKNOD
-	ZFS_AC_KERNEL_SYMLINK
-	ZFS_AC_KERNEL_BIO_MAX_SEGS
 ])
 
 dnl #

config/zfs-build.m4

@@ -153,9 +153,6 @@ AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [
 ])
 
 AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
-	AX_COUNT_CPUS([])
-	AC_SUBST(CPU_COUNT)
-
 	ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE
 	ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE
 	ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN
@@ -170,7 +167,6 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
 	ZFS_AC_CONFIG_ALWAYS_PYTHON
 	ZFS_AC_CONFIG_ALWAYS_PYZFS
 	ZFS_AC_CONFIG_ALWAYS_SED
-	ZFS_AC_CONFIG_ALWAYS_CPPCHECK
 ])
 
 AC_DEFUN([ZFS_AC_CONFIG], [
@@ -195,10 +191,12 @@ AC_DEFUN([ZFS_AC_CONFIG], [
 
 	ZFS_AC_CONFIG_ALWAYS
 
+
 	AM_COND_IF([BUILD_LINUX], [
-		AC_ARG_VAR([TEST_JOBS], [simultaneous jobs during configure])
+		AC_ARG_VAR([TEST_JOBS],
+		    [simultaneous jobs during configure (defaults to $(nproc))])
 		if test "x$ac_cv_env_TEST_JOBS_set" != "xset"; then
-			TEST_JOBS=$CPU_COUNT
+			TEST_JOBS=$(nproc)
 		fi
 		AC_SUBST(TEST_JOBS)
 	])

configure.ac

@@ -228,7 +228,6 @@ AC_CONFIG_FILES([
 	tests/zfs-tests/cmd/readmmap/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
@@ -237,7 +236,6 @@ AC_CONFIG_FILES([
 	tests/zfs-tests/tests/Makefile
 	tests/zfs-tests/tests/functional/Makefile
 	tests/zfs-tests/tests/functional/acl/Makefile
-	tests/zfs-tests/tests/functional/acl/off/Makefile
 	tests/zfs-tests/tests/functional/acl/posix/Makefile
 	tests/zfs-tests/tests/functional/acl/posix-sa/Makefile
 	tests/zfs-tests/tests/functional/alloc_class/Makefile

cppcheck-suppressions.txt

@@ -0,0 +1,8 @@
+preprocessorErrorDirective:./module/zfs/vdev_raidz_math_avx512f.c:243
+preprocessorErrorDirective:./module/zfs/vdev_raidz_math_sse2.c:266
+uninitvar:module/os/freebsd/zfs/vdev_geom.c
+uninitvar:module/os/freebsd/zfs/zfs_vfsops.c
+uninitvar:module/os/freebsd/spl/spl_zone.c
+uninitvar:lib/libzutil/os/freebsd/zutil_import_os.c
+*:module/zstd/lib/zstd.c
+*:module/zstd/lib/zstd.h

include/os/freebsd/spl/sys/Makefile.am

@@ -4,7 +4,6 @@ KERNEL_H = \
 	atomic.h \
 	byteorder.h \
 	callb.h \
-	ccompat.h \
 	ccompile.h \
 	cmn_err.h \
 	condvar.h \
@@ -19,11 +18,9 @@ KERNEL_H = \
 	fcntl.h \
 	file.h \
 	freebsd_rwlock.h \
-	idmap.h \
 	inttypes.h \
 	isa_defs.h \
 	kmem_cache.h \
-	kidmap.h \
 	kmem.h \
 	kstat.h \
 	list_impl.h \

include/os/freebsd/spl/sys/debug.h

@@ -68,65 +68,65 @@ void spl_dumpstack(void);
 #define	PANIC(fmt, a...)						\
 	spl_panic(__FILE__, __FUNCTION__, __LINE__, fmt, ## a)
 
-#define	VERIFY(cond)										\
-	(void) (unlikely(!(cond)) &&							\
+#define	VERIFY(cond)							\
+	(void) (unlikely(!(cond)) &&					\
 	    spl_panic(__FILE__, __FUNCTION__, __LINE__,			\
 	    "%s", "VERIFY(" #cond ") failed\n"))
 
-#define	VERIFY3B(LEFT, OP, RIGHT)	do {					\
-		const boolean_t _verify3_left = (boolean_t)(LEFT);	\
-		const boolean_t _verify3_right = (boolean_t)(RIGHT);\
-		if (unlikely(!(_verify3_left OP _verify3_right)))	\
+#define	VERIFY3B(LEFT, OP, RIGHT)	do {				\
+		boolean_t _verify3_left = (boolean_t)(LEFT);		\
+		boolean_t _verify3_right = (boolean_t)(RIGHT);		\
+		if (!(_verify3_left OP _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%d " #OP " %d)\n",						\
-		    (boolean_t) (_verify3_left),					\
-		    (boolean_t) (_verify3_right));					\
+		    "failed (%d " #OP " %d)\n",				\
+		    (boolean_t) (_verify3_left),			\
+		    (boolean_t) (_verify3_right));			\
 	} while (0)
 
-#define	VERIFY3S(LEFT, OP, RIGHT)	do {					\
-		const int64_t _verify3_left = (int64_t)(LEFT);		\
-		const int64_t _verify3_right = (int64_t)(RIGHT);	\
-		if (unlikely(!(_verify3_left OP _verify3_right)))	\
+#define	VERIFY3S(LEFT, OP, RIGHT)	do {				\
+		int64_t _verify3_left = (int64_t)(LEFT);		\
+		int64_t _verify3_right = (int64_t)(RIGHT);		\
+		if (!(_verify3_left OP _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%lld " #OP " %lld)\n",					\
-		    (long long) (_verify3_left),					\
-		    (long long) (_verify3_right));					\
+		    "failed (%lld " #OP " %lld)\n",			\
+		    (long long) (_verify3_left),			\
+		    (long long) (_verify3_right));			\
 	} while (0)
 
-#define	VERIFY3U(LEFT, OP, RIGHT)	do {					\
-		const uint64_t _verify3_left = (uint64_t)(LEFT);	\
-		const uint64_t _verify3_right = (uint64_t)(RIGHT);	\
-		if (unlikely(!(_verify3_left OP _verify3_right)))	\
+#define	VERIFY3U(LEFT, OP, RIGHT)	do {				\
+		uint64_t _verify3_left = (uint64_t)(LEFT);		\
+		uint64_t _verify3_right = (uint64_t)(RIGHT);		\
+		if (!(_verify3_left OP _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%llu " #OP " %llu)\n",					\
-		    (unsigned long long) (_verify3_left),			\
-		    (unsigned long long) (_verify3_right));			\
+		    "failed (%llu " #OP " %llu)\n",			\
+		    (unsigned long long) (_verify3_left),		\
+		    (unsigned long long) (_verify3_right));		\
 	} while (0)
 
-#define	VERIFY3P(LEFT, OP, RIGHT)	do {					\
-		const uintptr_t _verify3_left = (uintptr_t)(LEFT);	\
-		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);\
-		if (unlikely(!(_verify3_left OP _verify3_right)))	\
+#define	VERIFY3P(LEFT, OP, RIGHT)	do {				\
+		uintptr_t _verify3_left = (uintptr_t)(LEFT);		\
+		uintptr_t _verify3_right = (uintptr_t)(RIGHT);		\
+		if (!(_verify3_left OP _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%px " #OP " %px)\n",					\
-		    (void *) (_verify3_left),						\
-		    (void *) (_verify3_right));						\
+		    "failed (%px " #OP " %px)\n",			\
+		    (void *) (_verify3_left),				\
+		    (void *) (_verify3_right));				\
 	} while (0)
 
-#define	VERIFY0(RIGHT)	do {								\
-		const int64_t _verify3_left = (int64_t)(0);			\
-		const int64_t _verify3_right = (int64_t)(RIGHT);	\
-		if (unlikely(!(_verify3_left == _verify3_right)))	\
+#define	VERIFY0(RIGHT)	do {				\
+		int64_t _verify3_left = (int64_t)(0);		\
+		int64_t _verify3_right = (int64_t)(RIGHT);		\
+		if (!(_verify3_left == _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
-		    "VERIFY3(0 == " #RIGHT ") "						\
-		    "failed (0 == %lld)\n",							\
-		    (long long) (_verify3_right));					\
+		    "VERIFY3(0 == " #RIGHT ") "				\
+		    "failed (0 == %lld)\n",				\
+		    (long long) (_verify3_right));			\
 	} while (0)
-#define        CTASSERT_GLOBAL(x)              CTASSERT(x)
+#define	CTASSERT_GLOBAL(x)		CTASSERT(x)
 
 /*
  * Debugging disabled (--disable-debug)
@@ -154,11 +154,11 @@ void spl_dumpstack(void);
 #define	ASSERT0		VERIFY0
 #define	ASSERT		VERIFY
 #define	IMPLY(A, B) \
-	((void)(likely((!(A)) || (B)) || \
+	((void)(((!(A)) || (B)) || \
 	    spl_panic(__FILE__, __FUNCTION__, __LINE__, \
 	    "(" #A ") implies (" #B ")")))
 #define	EQUIV(A, B) \
-	((void)(likely(!!(A) == !!(B)) || \
+	((void)((!!(A) == !!(B)) || \
 	    spl_panic(__FILE__, __FUNCTION__, __LINE__, \
 	    "(" #A ") is equivalent to (" #B ")")))
 /* END CSTYLED */

include/os/freebsd/spl/sys/misc.h

@@ -30,7 +30,6 @@
 #define	_OPENSOLARIS_SYS_MISC_H_
 
 #include <sys/limits.h>
-#include <sys/filio.h>
 
 #define	MAXUID	UID_MAX
 
@@ -41,8 +40,8 @@
 #define	_FIOGDIO	(INT_MIN+1)
 #define	_FIOSDIO	(INT_MIN+2)
 
-#define	F_SEEK_DATA	FIOSEEKDATA
-#define	F_SEEK_HOLE	FIOSEEKHOLE
+#define	_FIO_SEEK_DATA	FIOSEEKDATA
+#define	_FIO_SEEK_HOLE	FIOSEEKHOLE
 
 struct opensolaris_utsname {
 	char	*sysname;

include/os/freebsd/zfs/sys/zfs_vfsops_os.h

@@ -27,10 +27,6 @@
 #ifndef	_SYS_FS_ZFS_VFSOPS_H
 #define	_SYS_FS_ZFS_VFSOPS_H
 
-#if __FreeBSD_version >= 1300125
-#define	TEARDOWN_RMS
-#endif
-
 #if __FreeBSD_version >= 1300109
 #define	TEARDOWN_INACTIVE_RMS
 #endif
@@ -50,16 +46,10 @@
 extern "C" {
 #endif
 
-#ifdef TEARDOWN_RMS
+#ifdef TEARDOWN_INACTIVE_RMS
 typedef struct rmslock zfs_teardown_lock_t;
 #else
-#define	zfs_teardown_lock_t		rrmlock_t
-#endif
-
-#ifdef TEARDOWN_INACTIVE_RMS
-typedef struct rmslock zfs_teardown_inactive_lock_t;
-#else
-#define	zfs_teardown_inactive_lock_t krwlock_t
+#define	zfs_teardown_lock_t krwlock_t
 #endif
 
 typedef struct zfsvfs zfsvfs_t;
@@ -90,8 +80,8 @@ struct zfsvfs {
 	int		z_norm;		/* normalization flags */
 	boolean_t	z_atime;	/* enable atimes mount option */
 	boolean_t	z_unmounted;	/* unmounted */
-	zfs_teardown_lock_t z_teardown_lock;
-	zfs_teardown_inactive_lock_t z_teardown_inactive_lock;
+	rrmlock_t	z_teardown_lock;
+	zfs_teardown_lock_t z_teardown_inactive_lock;
 	list_t		z_all_znodes;	/* all vnodes in the fs */
 	uint64_t	z_nr_znodes;	/* number of znodes in the fs */
 	kmutex_t	z_znodes_lock;	/* lock for z_all_znodes */
@@ -122,121 +112,53 @@ struct zfsvfs {
 	struct task	z_unlinked_drain_task;
 };
 
-#ifdef TEARDOWN_RMS
-#define	ZFS_TEARDOWN_INIT(zfsvfs)		\
-	rms_init(&(zfsvfs)->z_teardown_lock, "zfs teardown")
-
-#define	ZFS_TEARDOWN_DESTROY(zfsvfs)		\
-	rms_destroy(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_TRY_ENTER_READ(zfsvfs)	\
-	rms_try_rlock(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_ENTER_READ(zfsvfs, tag)	\
-	rms_rlock(&(zfsvfs)->z_teardown_lock);
-
-#define	ZFS_TEARDOWN_EXIT_READ(zfsvfs, tag)	\
-	rms_runlock(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_ENTER_WRITE(zfsvfs, tag)	\
-	rms_wlock(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_EXIT_WRITE(zfsvfs)		\
-	rms_wunlock(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_EXIT(zfsvfs, tag)		\
-	rms_unlock(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_READ_HELD(zfsvfs)		\
-	rms_rowned(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_WRITE_HELD(zfsvfs)		\
-	rms_wowned(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_HELD(zfsvfs)		\
-	rms_owned_any(&(zfsvfs)->z_teardown_lock)
-#else
-#define	ZFS_TEARDOWN_INIT(zfsvfs)		\
-	rrm_init(&(zfsvfs)->z_teardown_lock, B_FALSE)
-
-#define	ZFS_TEARDOWN_DESTROY(zfsvfs)		\
-	rrm_destroy(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_TRY_ENTER_READ(zfsvfs)	\
-	rw_tryenter(&(zfsvfs)->z_teardown_lock, RW_READER)
-
-#define	ZFS_TEARDOWN_ENTER_READ(zfsvfs, tag)	\
-	rrm_enter_read(&(zfsvfs)->z_teardown_lock, tag);
-
-#define	ZFS_TEARDOWN_EXIT_READ(zfsvfs, tag)	\
-	rrm_exit(&(zfsvfs)->z_teardown_lock, tag)
-
-#define	ZFS_TEARDOWN_ENTER_WRITE(zfsvfs, tag)	\
-	rrm_enter(&(zfsvfs)->z_teardown_lock, RW_WRITER, tag)
-
-#define	ZFS_TEARDOWN_EXIT_WRITE(zfsvfs)		\
-	rrm_exit(&(zfsvfs)->z_teardown_lock, tag)
-
-#define	ZFS_TEARDOWN_EXIT(zfsvfs, tag)		\
-	rrm_exit(&(zfsvfs)->z_teardown_lock, tag)
-
-#define	ZFS_TEARDOWN_READ_HELD(zfsvfs)		\
-	RRM_READ_HELD(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_WRITE_HELD(zfsvfs)		\
-	RRM_WRITE_HELD(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_HELD(zfsvfs)		\
-	RRM_LOCK_HELD(&(zfsvfs)->z_teardown_lock)
-#endif
-
 #ifdef TEARDOWN_INACTIVE_RMS
-#define	ZFS_TEARDOWN_INACTIVE_INIT(zfsvfs)		\
+#define	ZFS_INIT_TEARDOWN_INACTIVE(zfsvfs)	\
 	rms_init(&(zfsvfs)->z_teardown_inactive_lock, "zfs teardown inactive")
 
-#define	ZFS_TEARDOWN_INACTIVE_DESTROY(zfsvfs)		\
+#define	ZFS_DESTROY_TEARDOWN_INACTIVE(zfsvfs)	\
 	rms_destroy(&(zfsvfs)->z_teardown_inactive_lock)
 
-#define	ZFS_TEARDOWN_INACTIVE_TRY_ENTER_READ(zfsvfs)	\
+#define	ZFS_TRYRLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rms_try_rlock(&(zfsvfs)->z_teardown_inactive_lock)
 
-#define	ZFS_TEARDOWN_INACTIVE_ENTER_READ(zfsvfs)	\
+#define	ZFS_RLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rms_rlock(&(zfsvfs)->z_teardown_inactive_lock)
 
-#define	ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs)		\
+#define	ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rms_runlock(&(zfsvfs)->z_teardown_inactive_lock)
 
-#define	ZFS_TEARDOWN_INACTIVE_ENTER_WRITE(zfsvfs)	\
+#define	ZFS_WLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rms_wlock(&(zfsvfs)->z_teardown_inactive_lock)
 
-#define	ZFS_TEARDOWN_INACTIVE_EXIT_WRITE(zfsvfs)	\
+#define	ZFS_WUNLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rms_wunlock(&(zfsvfs)->z_teardown_inactive_lock)
 
-#define	ZFS_TEARDOWN_INACTIVE_WRITE_HELD(zfsvfs)	\
+#define	ZFS_TEARDOWN_INACTIVE_WLOCKED(zfsvfs)	\
 	rms_wowned(&(zfsvfs)->z_teardown_inactive_lock)
 #else
-#define	ZFS_TEARDOWN_INACTIVE_INIT(zfsvfs)		\
+#define	ZFS_INIT_TEARDOWN_INACTIVE(zfsvfs)	\
 	rw_init(&(zfsvfs)->z_teardown_inactive_lock, NULL, RW_DEFAULT, NULL)
 
-#define	ZFS_TEARDOWN_INACTIVE_DESTROY(zfsvfs)		\
+#define	ZFS_DESTROY_TEARDOWN_INACTIVE(zfsvfs)	\
 	rw_destroy(&(zfsvfs)->z_teardown_inactive_lock)
 
-#define	ZFS_TEARDOWN_INACTIVE_TRY_ENTER_READ(zfsvfs)	\
+#define	ZFS_TRYRLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rw_tryenter(&(zfsvfs)->z_teardown_inactive_lock, RW_READER)
 
-#define	ZFS_TEARDOWN_INACTIVE_ENTER_READ(zfsvfs)	\
+#define	ZFS_RLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rw_enter(&(zfsvfs)->z_teardown_inactive_lock, RW_READER)
 
-#define	ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs)		\
+#define	ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rw_exit(&(zfsvfs)->z_teardown_inactive_lock)
 
-#define	ZFS_TEARDOWN_INACTIVE_ENTER_WRITE(zfsvfs)	\
+#define	ZFS_WLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rw_enter(&(zfsvfs)->z_teardown_inactive_lock, RW_WRITER)
 
-#define	ZFS_TEARDOWN_INACTIVE_EXIT_WRITE(zfsvfs)	\
+#define	ZFS_WUNLOCK_TEARDOWN_INACTIVE(zfsvfs)	\
 	rw_exit(&(zfsvfs)->z_teardown_inactive_lock)
 
-#define	ZFS_TEARDOWN_INACTIVE_WRITE_HELD(zfsvfs)	\
+#define	ZFS_TEARDOWN_INACTIVE_WLOCKED(zfsvfs)	\
 	RW_WRITE_HELD(&(zfsvfs)->z_teardown_inactive_lock)
 #endif
 

include/os/freebsd/zfs/sys/zfs_znode_impl.h

@@ -122,19 +122,19 @@ extern minor_t zfsdev_minor_alloc(void);
 /* Called on entry to each ZFS vnode and vfs operation  */
 #define	ZFS_ENTER(zfsvfs) \
 	{ \
-		ZFS_TEARDOWN_ENTER_READ((zfsvfs), FTAG); \
-		if (__predict_false((zfsvfs)->z_unmounted)) { \
-			ZFS_TEARDOWN_EXIT_READ(zfsvfs, FTAG); \
+		rrm_enter_read(&(zfsvfs)->z_teardown_lock, FTAG); \
+		if ((zfsvfs)->z_unmounted) { \
+			ZFS_EXIT(zfsvfs); \
 			return (EIO); \
 		} \
 	}
 
 /* Must be called before exiting the vop */
-#define	ZFS_EXIT(zfsvfs) ZFS_TEARDOWN_EXIT_READ(zfsvfs, FTAG)
+#define	ZFS_EXIT(zfsvfs) rrm_exit(&(zfsvfs)->z_teardown_lock, FTAG)
 
 /* Verifies the znode is valid */
 #define	ZFS_VERIFY_ZP(zp) \
-	if (__predict_false((zp)->z_sa_hdl == NULL)) { \
+	if ((zp)->z_sa_hdl == NULL) { \
 		ZFS_EXIT((zp)->z_zfsvfs); \
 		return (EIO); \
 	} \
@@ -173,6 +173,7 @@ extern void	zfs_tstamp_update_setup_ext(struct znode *,
     uint_t, uint64_t [2], uint64_t [2], boolean_t have_tx);
 extern void zfs_znode_free(struct znode *);
 
+extern zil_get_data_t zfs_get_data;
 extern zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE];
 extern int zfsfstype;
 

include/os/linux/kernel/linux/blkdev_compat.h

@@ -277,22 +277,18 @@ bio_set_bi_error(struct bio *bio, int error)
 static inline int
 zfs_check_media_change(struct block_device *bdev)
 {
-#ifdef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK
 	struct gendisk *gd = bdev->bd_disk;
 	const struct block_device_operations *bdo = gd->fops;
-#endif
 
 	if (!bdev_check_media_change(bdev))
 		return (0);
 
-#ifdef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK
 	/*
 	 * Force revalidation, to mimic the old behavior of
 	 * check_disk_change()
 	 */
 	if (bdo->revalidate_disk)
 		bdo->revalidate_disk(gd);
-#endif
 
 	return (0);
 }
@@ -524,9 +520,7 @@ blk_generic_start_io_acct(struct request_queue *q __attribute__((unused)),
     struct gendisk *disk __attribute__((unused)),
     int rw __attribute__((unused)), struct bio *bio)
 {
-#if defined(HAVE_DISK_IO_ACCT)
-	return (disk_start_io_acct(disk, bio_sectors(bio), bio_op(bio)));
-#elif defined(HAVE_BIO_IO_ACCT)
+#if defined(HAVE_BIO_IO_ACCT)
 	return (bio_start_io_acct(bio));
 #elif defined(HAVE_GENERIC_IO_ACCT_3ARG)
 	unsigned long start_time = jiffies;
@@ -547,9 +541,7 @@ blk_generic_end_io_acct(struct request_queue *q __attribute__((unused)),
     struct gendisk *disk __attribute__((unused)),
     int rw __attribute__((unused)), struct bio *bio, unsigned long start_time)
 {
-#if defined(HAVE_DISK_IO_ACCT)
-	disk_end_io_acct(disk, bio_op(bio), start_time);
-#elif defined(HAVE_BIO_IO_ACCT)
+#if defined(HAVE_BIO_IO_ACCT)
 	bio_end_io_acct(bio, start_time);
 #elif defined(HAVE_GENERIC_IO_ACCT_3ARG)
 	generic_end_io_acct(rw, &disk->part0, start_time);

include/os/linux/kernel/linux/vfs_compat.h

@@ -343,8 +343,7 @@ static inline void zfs_gid_write(struct inode *ip, gid_t gid)
 /*
  * 4.9 API change
  */
-#if !(defined(HAVE_SETATTR_PREPARE_NO_USERNS) || \
-    defined(HAVE_SETATTR_PREPARE_USERNS))
+#ifndef HAVE_SETATTR_PREPARE
 static inline int
 setattr_prepare(struct dentry *dentry, struct iattr *ia)
 {
@@ -390,15 +389,6 @@ func(const struct path *path, struct kstat *stat, u32 request_mask,	\
 {									\
 	return (func##_impl(path, stat, request_mask, query_flags));	\
 }
-#elif defined(HAVE_USERNS_IOPS_GETATTR)
-#define	ZPL_GETATTR_WRAPPER(func)					\
-static int								\
-func(struct user_namespace *user_ns, const struct path *path,	\
-    struct kstat *stat, u32 request_mask, unsigned int query_flags)	\
-{									\
-	return (func##_impl(user_ns, path, stat, request_mask, \
-	    query_flags));	\
-}
 #else
 #error
 #endif
@@ -446,16 +436,4 @@ zpl_is_32bit_api(void)
 #endif
 }
 
-/*
- * 5.12 API change
- * To support id-mapped mounts, generic_fillattr() was modified to
- * accept a new struct user_namespace* as its first arg.
- */
-#ifdef HAVE_GENERIC_FILLATTR_USERNS
-#define	zpl_generic_fillattr(user_ns, ip, sp)	\
-    generic_fillattr(user_ns, ip, sp)
-#else
-#define	zpl_generic_fillattr(user_ns, ip, sp)	generic_fillattr(ip, sp)
-#endif
-
 #endif /* _ZFS_VFS_H */

include/os/linux/kernel/linux/xattr_compat.h

@@ -119,27 +119,12 @@ fn(struct dentry *dentry, const char *name, void *buffer, size_t size,	\
 #error "Unsupported kernel"
 #endif
 
-/*
- * 5.12 API change,
- * The xattr_handler->set() callback was changed to take the
- * struct user_namespace* as the first arg, to support idmapped
- * mounts.
- */
-#if defined(HAVE_XATTR_SET_USERNS)
-#define	ZPL_XATTR_SET_WRAPPER(fn)					\
-static int								\
-fn(const struct xattr_handler *handler, struct user_namespace *user_ns, \
-    struct dentry *dentry, struct inode *inode, const char *name,	\
-    const void *buffer, size_t size, int flags)	\
-{									\
-	return (__ ## fn(inode, name, buffer, size, flags));		\
-}
 /*
  * 4.7 API change,
  * The xattr_handler->set() callback was changed to take a both dentry and
  * inode, because the dentry might not be attached to an inode yet.
  */
-#elif defined(HAVE_XATTR_SET_DENTRY_INODE)
+#if defined(HAVE_XATTR_SET_DENTRY_INODE)
 #define	ZPL_XATTR_SET_WRAPPER(fn)					\
 static int								\
 fn(const struct xattr_handler *handler, struct dentry *dentry,		\

include/os/linux/spl/sys/debug.h

@@ -62,63 +62,63 @@ void spl_dumpstack(void);
 #define	PANIC(fmt, a...)						\
 	spl_panic(__FILE__, __FUNCTION__, __LINE__, fmt, ## a)
 
-#define	VERIFY(cond)										\
-	(void) (unlikely(!(cond)) &&							\
+#define	VERIFY(cond)							\
+	(void) (unlikely(!(cond)) &&					\
 	    spl_panic(__FILE__, __FUNCTION__, __LINE__,			\
 	    "%s", "VERIFY(" #cond ") failed\n"))
 
-#define	VERIFY3B(LEFT, OP, RIGHT)	do {					\
-		const boolean_t _verify3_left = (boolean_t)(LEFT);	\
-		const boolean_t _verify3_right = (boolean_t)(RIGHT);\
-		if (unlikely(!(_verify3_left OP _verify3_right)))	\
+#define	VERIFY3B(LEFT, OP, RIGHT)	do {				\
+		boolean_t _verify3_left = (boolean_t)(LEFT);		\
+		boolean_t _verify3_right = (boolean_t)(RIGHT);		\
+		if (!(_verify3_left OP _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%d " #OP " %d)\n",						\
-		    (boolean_t) (_verify3_left),					\
-		    (boolean_t) (_verify3_right));					\
+		    "failed (%d " #OP " %d)\n",				\
+		    (boolean_t) (_verify3_left),			\
+		    (boolean_t) (_verify3_right));			\
 	} while (0)
 
-#define	VERIFY3S(LEFT, OP, RIGHT)	do {					\
-		const int64_t _verify3_left = (int64_t)(LEFT);		\
-		const int64_t _verify3_right = (int64_t)(RIGHT);	\
-		if (unlikely(!(_verify3_left OP _verify3_right)))	\
+#define	VERIFY3S(LEFT, OP, RIGHT)	do {				\
+		int64_t _verify3_left = (int64_t)(LEFT);		\
+		int64_t _verify3_right = (int64_t)(RIGHT);		\
+		if (!(_verify3_left OP _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%lld " #OP " %lld)\n",					\
-		    (long long) (_verify3_left),					\
-		    (long long) (_verify3_right));					\
+		    "failed (%lld " #OP " %lld)\n",			\
+		    (long long) (_verify3_left),			\
+		    (long long) (_verify3_right));			\
 	} while (0)
 
-#define	VERIFY3U(LEFT, OP, RIGHT)	do {					\
-		const uint64_t _verify3_left = (uint64_t)(LEFT);	\
-		const uint64_t _verify3_right = (uint64_t)(RIGHT);	\
-		if (unlikely(!(_verify3_left OP _verify3_right)))	\
+#define	VERIFY3U(LEFT, OP, RIGHT)	do {				\
+		uint64_t _verify3_left = (uint64_t)(LEFT);		\
+		uint64_t _verify3_right = (uint64_t)(RIGHT);		\
+		if (!(_verify3_left OP _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%llu " #OP " %llu)\n",					\
-		    (unsigned long long) (_verify3_left),			\
-		    (unsigned long long) (_verify3_right));			\
+		    "failed (%llu " #OP " %llu)\n",			\
+		    (unsigned long long) (_verify3_left),		\
+		    (unsigned long long) (_verify3_right));		\
 	} while (0)
 
-#define	VERIFY3P(LEFT, OP, RIGHT)	do {					\
-		const uintptr_t _verify3_left = (uintptr_t)(LEFT);	\
-		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);\
-		if (unlikely(!(_verify3_left OP _verify3_right)))	\
+#define	VERIFY3P(LEFT, OP, RIGHT)	do {				\
+		uintptr_t _verify3_left = (uintptr_t)(LEFT);		\
+		uintptr_t _verify3_right = (uintptr_t)(RIGHT);		\
+		if (!(_verify3_left OP _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%px " #OP " %px)\n",					\
-		    (void *) (_verify3_left),						\
-		    (void *) (_verify3_right));						\
+		    "failed (%px " #OP " %px)\n",			\
+		    (void *) (_verify3_left),				\
+		    (void *) (_verify3_right));				\
 	} while (0)
 
-#define	VERIFY0(RIGHT)	do {								\
-		const int64_t _verify3_left = (int64_t)(0);			\
-		const int64_t _verify3_right = (int64_t)(RIGHT);	\
-		if (unlikely(!(_verify3_left == _verify3_right)))	\
+#define	VERIFY0(RIGHT)	do {				\
+		int64_t _verify3_left = (int64_t)(0);		\
+		int64_t _verify3_right = (int64_t)(RIGHT);		\
+		if (!(_verify3_left == _verify3_right))			\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
-		    "VERIFY3(0 == " #RIGHT ") "						\
-		    "failed (0 == %lld)\n",							\
-		    (long long) (_verify3_right));					\
+		    "VERIFY3(0 == " #RIGHT ") "				\
+		    "failed (0 == %lld)\n",				\
+		    (long long) (_verify3_right));			\
 	} while (0)
 
 #define	CTASSERT_GLOBAL(x)		_CTASSERT(x, __LINE__)
@@ -154,11 +154,11 @@ void spl_dumpstack(void);
 #define	ASSERT0		VERIFY0
 #define	ASSERT		VERIFY
 #define	IMPLY(A, B) \
-	((void)(likely((!(A)) || (B)) || \
+	((void)(((!(A)) || (B)) || \
 	    spl_panic(__FILE__, __FUNCTION__, __LINE__, \
 	    "(" #A ") implies (" #B ")")))
 #define	EQUIV(A, B) \
-	((void)(likely(!!(A) == !!(B)) || \
+	((void)((!!(A) == !!(B)) || \
 	    spl_panic(__FILE__, __FUNCTION__, __LINE__, \
 	    "(" #A ") is equivalent to (" #B ")")))
 /* END CSTYLED */

include/os/linux/spl/sys/vnode.h

@@ -52,12 +52,6 @@
 
 #define	F_FREESP	11 	/* Free file space */
 
-
-#if defined(SEEK_HOLE) && defined(SEEK_DATA)
-#define	F_SEEK_DATA	SEEK_DATA
-#define	F_SEEK_HOLE	SEEK_HOLE
-#endif
-
 /*
  * The vnode AT_ flags are mapped to the Linux ATTR_* flags.
  * This allows them to be used safely with an iattr structure.

include/os/linux/zfs/sys/zfs_vfsops_os.h

@@ -138,39 +138,6 @@ struct zfsvfs {
 	taskqid_t	z_drain_task;	/* task id for the unlink drain task */
 };
 
-#define	ZFS_TEARDOWN_INIT(zfsvfs)		\
-	rrm_init(&(zfsvfs)->z_teardown_lock, B_FALSE)
-
-#define	ZFS_TEARDOWN_DESTROY(zfsvfs)		\
-	rrm_destroy(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_TRY_ENTER_READ(zfsvfs)	\
-	rw_tryenter(&(zfsvfs)->z_teardown_lock, RW_READER)
-
-#define	ZFS_TEARDOWN_ENTER_READ(zfsvfs, tag)	\
-	rrm_enter_read(&(zfsvfs)->z_teardown_lock, tag);
-
-#define	ZFS_TEARDOWN_EXIT_READ(zfsvfs, tag)	\
-	rrm_exit(&(zfsvfs)->z_teardown_lock, tag)
-
-#define	ZFS_TEARDOWN_ENTER_WRITE(zfsvfs, tag)	\
-	rrm_enter(&(zfsvfs)->z_teardown_lock, RW_WRITER, tag)
-
-#define	ZFS_TEARDOWN_EXIT_WRITE(zfsvfs)		\
-	rrm_exit(&(zfsvfs)->z_teardown_lock, tag)
-
-#define	ZFS_TEARDOWN_EXIT(zfsvfs, tag)		\
-	rrm_exit(&(zfsvfs)->z_teardown_lock, tag)
-
-#define	ZFS_TEARDOWN_READ_HELD(zfsvfs)		\
-	RRM_READ_HELD(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_WRITE_HELD(zfsvfs)		\
-	RRM_WRITE_HELD(&(zfsvfs)->z_teardown_lock)
-
-#define	ZFS_TEARDOWN_HELD(zfsvfs)		\
-	RRM_LOCK_HELD(&(zfsvfs)->z_teardown_lock)
-
 #define	ZSB_XATTR	0x0001		/* Enable user xattrs */
 
 /*

include/os/linux/zfs/sys/zfs_vnops_os.h

@@ -40,8 +40,10 @@ extern "C" {
 
 extern int zfs_open(struct inode *ip, int mode, int flag, cred_t *cr);
 extern int zfs_close(struct inode *ip, int flag, cred_t *cr);
+extern int zfs_holey(struct inode *ip, int cmd, loff_t *off);
 extern int zfs_write_simple(znode_t *zp, const void *data, size_t len,
     loff_t pos, size_t *resid);
+extern int zfs_access(struct inode *ip, int mode, int flag, cred_t *cr);
 extern int zfs_lookup(znode_t *dzp, char *nm, znode_t **zpp, int flags,
     cred_t *cr, int *direntflags, pathname_t *realpnp);
 extern int zfs_create(znode_t *dzp, char *name, vattr_t *vap, int excl,
@@ -54,8 +56,7 @@ extern int zfs_mkdir(znode_t *dzp, char *dirname, vattr_t *vap,
 extern int zfs_rmdir(znode_t *dzp, char *name, znode_t *cwd,
     cred_t *cr, int flags);
 extern int zfs_readdir(struct inode *ip, zpl_dir_context_t *ctx, cred_t *cr);
-extern int zfs_getattr_fast(struct user_namespace *, struct inode *ip,
-	struct kstat *sp);
+extern int zfs_getattr_fast(struct inode *ip, struct kstat *sp);
 extern int zfs_setattr(znode_t *zp, vattr_t *vap, int flag, cred_t *cr);
 extern int zfs_rename(znode_t *sdzp, char *snm, znode_t *tdzp,
     char *tnm, cred_t *cr, int flags);

include/os/linux/zfs/sys/zfs_znode_impl.h

@@ -73,21 +73,15 @@ extern "C" {
 #define	zn_has_cached_data(zp)	((zp)->z_is_mapped)
 #define	zn_rlimit_fsize(zp, uio, td)	(0)
 
-/*
- * zhold() wraps igrab() on Linux, and igrab() may fail when the
- * inode is in the process of being deleted.  As zhold() must only be
- * called when a ref already exists - so the inode cannot be
- * mid-deletion - we VERIFY() this.
- */
-#define	zhold(zp)	VERIFY3P(igrab(ZTOI((zp))), !=, NULL)
+#define	zhold(zp)	igrab(ZTOI((zp)))
 #define	zrele(zp)	iput(ZTOI((zp)))
 
 /* Called on entry to each ZFS inode and vfs operation. */
 #define	ZFS_ENTER_ERROR(zfsvfs, error)				\
 do {								\
-	ZFS_TEARDOWN_ENTER_READ(zfsvfs, FTAG);			\
-	if (unlikely((zfsvfs)->z_unmounted)) {			\
-		ZFS_TEARDOWN_EXIT_READ(zfsvfs, FTAG);		\
+	rrm_enter_read(&(zfsvfs)->z_teardown_lock, FTAG);	\
+	if ((zfsvfs)->z_unmounted) {				\
+		ZFS_EXIT(zfsvfs);				\
 		return (error);					\
 	}							\
 } while (0)
@@ -98,7 +92,7 @@ do {								\
 #define	ZFS_EXIT(zfsvfs)					\
 do {								\
 	zfs_exit_fs(zfsvfs);					\
-	ZFS_TEARDOWN_EXIT_READ(zfsvfs, FTAG);			\
+	rrm_exit(&(zfsvfs)->z_teardown_lock, FTAG);		\
 } while (0)
 
 #define	ZPL_EXIT(zfsvfs)					\
@@ -109,7 +103,7 @@ do {								\
 /* Verifies the znode is valid. */
 #define	ZFS_VERIFY_ZP_ERROR(zp, error)				\
 do {								\
-	if (unlikely((zp)->z_sa_hdl == NULL)) {			\
+	if ((zp)->z_sa_hdl == NULL) {				\
 		ZFS_EXIT(ZTOZSB(zp));				\
 		return (error);					\
 	}							\
@@ -173,6 +167,7 @@ extern caddr_t zfs_map_page(page_t *, enum seg_rw);
 extern void zfs_unmap_page(page_t *, caddr_t);
 #endif /* HAVE_UIO_RW */
 
+extern zil_get_data_t zfs_get_data;
 extern zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE];
 extern int zfsfstype;
 

include/os/linux/zfs/sys/zpl.h

@@ -63,12 +63,7 @@ extern int zpl_xattr_security_init(struct inode *ip, struct inode *dip,
     const struct qstr *qstr);
 #if defined(CONFIG_FS_POSIX_ACL)
 #if defined(HAVE_SET_ACL)
-#if defined(HAVE_SET_ACL_USERNS)
-extern int zpl_set_acl(struct user_namespace *userns, struct inode *ip,
-    struct posix_acl *acl, int type);
-#else
 extern int zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type);
-#endif /* HAVE_SET_ACL_USERNS */
 #endif /* HAVE_SET_ACL */
 extern struct posix_acl *zpl_get_acl(struct inode *ip, int type);
 extern int zpl_init_acl(struct inode *ip, struct inode *dir);
@@ -176,22 +171,4 @@ zpl_dir_emit_dots(struct file *file, zpl_dir_context_t *ctx)
 	timespec_trunc(ts, (ip)->i_sb->s_time_gran)
 #endif
 
-#if defined(HAVE_INODE_OWNER_OR_CAPABLE)
-#define	zpl_inode_owner_or_capable(ns, ip)	inode_owner_or_capable(ip)
-#elif defined(HAVE_INODE_OWNER_OR_CAPABLE_IDMAPPED)
-#define	zpl_inode_owner_or_capable(ns, ip)	inode_owner_or_capable(ns, ip)
-#else
-#error "Unsupported kernel"
-#endif
-
-#ifdef HAVE_SETATTR_PREPARE_USERNS
-#define	zpl_setattr_prepare(ns, dentry, ia)	setattr_prepare(ns, dentry, ia)
-#else
-/*
- * Use kernel-provided version, or our own from
- * linux/vfs_compat.h
- */
-#define	zpl_setattr_prepare(ns, dentry, ia)	setattr_prepare(dentry, ia)
-#endif
-
 #endif	/* _SYS_ZPL_H */

include/sys/Makefile.am

@@ -110,7 +110,6 @@ COMMON_H = \
 	zfs_fuid.h \
 	zfs_project.h \
 	zfs_quota.h \
-	zfs_racct.h \
 	zfs_ratelimit.h \
 	zfs_refcount.h \
 	zfs_rlock.h \

include/sys/dmu_redact.h

@@ -39,7 +39,6 @@ redact_block_get_size(redact_block_phys_t *rbp)
 static inline void
 redact_block_set_size(redact_block_phys_t *rbp, uint64_t size)
 {
-	/* cppcheck-suppress syntaxError */
 	BF64_SET_SB((rbp)->rbp_size_count, 48, 16, SPA_MINBLOCKSHIFT, 0, size);
 }
 
@@ -52,7 +51,6 @@ redact_block_get_count(redact_block_phys_t *rbp)
 static inline void
 redact_block_set_count(redact_block_phys_t *rbp, uint64_t count)
 {
-	/* cppcheck-suppress syntaxError */
 	BF64_SET_SB((rbp)->rbp_size_count, 0, 48, 0, 1, count);
 }
 

include/sys/vdev_impl.h

@@ -441,11 +441,10 @@ struct vdev {
 	kmutex_t	vdev_probe_lock; /* protects vdev_probe_zio	*/
 
 	/*
-	 * We rate limit ZIO delay, deadman, and checksum events, since they
+	 * We rate limit ZIO delay and ZIO checksum events, since they
 	 * can flood ZED with tons of events when a drive is acting up.
 	 */
 	zfs_ratelimit_t vdev_delay_rl;
-	zfs_ratelimit_t vdev_deadman_rl;
 	zfs_ratelimit_t vdev_checksum_rl;
 };
 

include/sys/zfs_ioctl.h

@@ -525,6 +525,7 @@ typedef struct zfs_useracct {
 } zfs_useracct_t;
 
 #define	ZFSDEV_MAX_MINOR	(1 << 16)
+#define	ZFS_MIN_MINOR	(ZFSDEV_MAX_MINOR + 1)
 
 #define	ZPOOL_EXPORT_AFTER_SPLIT 0x1
 

include/sys/zfs_racct.h

@@ -1,37 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Portions Copyright 2021 iXsystems, Inc.
- */
-
-#ifndef _SYS_ZFS_RACCT_H
-#define	_SYS_ZFS_RACCT_H
-
-#include <sys/zfs_context.h>
-
-/*
- * Platform-dependent resource accounting hooks
- */
-void zfs_racct_read(uint64_t size, uint64_t iops);
-void zfs_racct_write(uint64_t size, uint64_t iops);
-
-#endif /* _SYS_ZFS_RACCT_H */

include/sys/zfs_vnops.h

@@ -29,27 +29,11 @@
 extern int zfs_fsync(znode_t *, int, cred_t *);
 extern int zfs_read(znode_t *, uio_t *, int, cred_t *);
 extern int zfs_write(znode_t *, uio_t *, int, cred_t *);
-extern int zfs_holey(znode_t *, ulong_t, loff_t *);
-extern int zfs_access(znode_t *, int, int, cred_t *);
-
-extern int zfs_getsecattr(znode_t *, vsecattr_t *, int, cred_t *);
-extern int zfs_setsecattr(znode_t *, vsecattr_t *, int, cred_t *);
+extern int zfs_getsecattr(znode_t *zp, vsecattr_t *vsecp, int flag, cred_t *cr);
+extern int zfs_setsecattr(znode_t *zp, vsecattr_t *vsecp, int flag, cred_t *cr);
 
 extern int mappedread(znode_t *, int, uio_t *);
 extern int mappedread_sf(znode_t *, int, uio_t *);
 extern void update_pages(znode_t *, int64_t, int, objset_t *);
 
-/*
- * Platform code that asynchronously drops zp's inode / vnode_t.
- *
- * Asynchronous dropping ensures that the caller will never drop the
- * last reference on an inode / vnode_t in the current context.
- * Doing so while holding open a tx could result in a deadlock if
- * the platform calls into filesystem again in the implementation
- * of inode / vnode_t dropping (e.g. call from iput_final()).
- */
-extern void zfs_zrele_async(znode_t *zp);
-
-extern zil_get_data_t zfs_get_data;
-
 #endif

include/sys/zil.h

@@ -399,7 +399,6 @@ typedef struct itx {
 	void		*itx_callback_data; /* User data for the callback */
 	size_t		itx_size;	/* allocated itx structure size */
 	uint64_t	itx_oid;	/* object id */
-	uint64_t	itx_gen;	/* gen number for zfs_get_data */
 	lr_t		itx_lr;		/* common part of log record */
 	/* followed by type-specific part of lr_xx_t and its immediate data */
 } itx_t;
@@ -468,7 +467,7 @@ typedef int zil_parse_blk_func_t(zilog_t *zilog, const blkptr_t *bp, void *arg,
 typedef int zil_parse_lr_func_t(zilog_t *zilog, const lr_t *lr, void *arg,
     uint64_t txg);
 typedef int zil_replay_func_t(void *arg1, void *arg2, boolean_t byteswap);
-typedef int zil_get_data_t(void *arg, uint64_t arg2, lr_write_t *lr, char *dbuf,
+typedef int zil_get_data_t(void *arg, lr_write_t *lr, char *dbuf,
     struct lwb *lwb, zio_t *zio);
 
 extern int zil_parse(zilog_t *zilog, zil_parse_blk_func_t *parse_blk_func,

include/sys/zvol_impl.h

@@ -85,8 +85,8 @@ void zvol_log_truncate(zvol_state_t *zv, dmu_tx_t *tx, uint64_t off,
     uint64_t len, boolean_t sync);
 void zvol_log_write(zvol_state_t *zv, dmu_tx_t *tx, uint64_t offset,
     uint64_t size, int sync);
-int zvol_get_data(void *arg, uint64_t arg2, lr_write_t *lr, char *buf,
-    struct lwb *lwb, zio_t *zio);
+int zvol_get_data(void *arg, lr_write_t *lr, char *buf, struct lwb *lwb,
+    zio_t *zio);
 int zvol_init_impl(void);
 void zvol_fini_impl(void);
 void zvol_wait_close(zvol_state_t *zv);

lib/Makefile.am

@@ -1,12 +1,9 @@
 # NB: GNU Automake Manual, Chapter 8.3.5: Libtool Convenience Libraries
 # These nine libraries are intermediary build components.
 SUBDIRS = libavl libicp libshare libspl libtpool libzstd
-CPPCHECKDIRS  = libavl libicp libnvpair libshare libspl libtpool libunicode
-CPPCHECKDIRS += libuutil libzfs libzfs_core libzfsbootenv libzpool libzutil
 
 if BUILD_LINUX
 SUBDIRS += libefi
-CPPCHECKDIRS += libefi
 endif
 
 # libnvpair is installed as part of the final build product
@@ -26,7 +23,7 @@ DISTLIBS += libnvpair
 # is only linked against by ztest and zdb and no stable ABI is provided.
 ABILIBS = libnvpair libuutil libzfs_core libzfs libzfsbootenv
 
-PHONY = checkabi storeabi cppcheck
+PHONY = checkabi storeabi
 checkabi: $(ABILIBS)
 	set -e ; for dir in $(ABILIBS) ; do \
 		$(MAKE) -C $$dir checkabi ; \
@@ -36,8 +33,3 @@ storeabi: $(ABILIBS)
 	set -e ; for dir in $(ABILIBS) ; do \
 		$(MAKE) -C $$dir storeabi ; \
 	done
-
-cppcheck: $(CPPCHECKDIRS)
-	set -e ; for dir in $(CPPCHECKDIRS) ; do \
-		$(MAKE) -C $$dir cppcheck ; \
-	done

lib/libavl/Makefile.am

@@ -12,5 +12,3 @@ KERNEL_C = \
 
 nodist_libavl_la_SOURCES = \
 	$(KERNEL_C)
-
-include $(top_srcdir)/config/CppCheck.am

lib/libefi/Makefile.am

@@ -10,5 +10,3 @@ USER_C = \
 libefi_la_SOURCES = $(USER_C)
 
 libefi_la_LIBADD = $(LIBUUID_LIBS) $(ZLIB_LIBS)
-
-include $(top_srcdir)/config/CppCheck.am

lib/libicp/Makefile.am

@@ -71,5 +71,3 @@ KERNEL_ASM = $(ASM_SOURCES_AS)
 nodist_libicp_la_SOURCES = \
 	$(KERNEL_C) \
 	$(KERNEL_ASM)
-
-include $(top_srcdir)/config/CppCheck.am

lib/libnvpair/Makefile.am

@@ -1,4 +1,5 @@
 include $(top_srcdir)/config/Rules.am
+PHONY =
 
 VPATH = \
 	$(top_srcdir)/module/nvpair \
@@ -41,7 +42,5 @@ endif
 
 libnvpair_la_LDFLAGS += -version-info 3:0:0
 
-include $(top_srcdir)/config/CppCheck.am
-
 # Library ABI
 EXTRA_DIST = libnvpair.abi libnvpair.suppr

lib/libshare/Makefile.am

@@ -23,5 +23,3 @@ USER_C += \
 endif
 
 libshare_la_SOURCES = $(USER_C)
-
-include $(top_srcdir)/config/CppCheck.am

lib/libshare/os/freebsd/nfs.c

@@ -65,22 +65,17 @@ static int nfs_lock_fd = -1;
 static int
 nfs_exports_lock(void)
 {
-	int err;
-
 	nfs_lock_fd = open(ZFS_EXPORTS_LOCK,
 	    O_RDWR | O_CREAT, 0600);
 	if (nfs_lock_fd == -1) {
-		err = errno;
 		fprintf(stderr, "failed to lock %s: %s\n",
-		    ZFS_EXPORTS_LOCK, strerror(err));
-		return (err);
+		    ZFS_EXPORTS_LOCK, strerror(errno));
+		return (errno);
 	}
 	if (flock(nfs_lock_fd, LOCK_EX) != 0) {
-		err = errno;
 		fprintf(stderr, "failed to lock %s: %s\n",
-		    ZFS_EXPORTS_LOCK, strerror(err));
-		(void) close(nfs_lock_fd);
-		return (err);
+		    ZFS_EXPORTS_LOCK, strerror(errno));
+		return (errno);
 	}
 	return (0);
 }
@@ -361,10 +356,14 @@ nfs_disable_share(sa_share_impl_t impl_share)
 	return (error);
 }
 
+/*
+ * NOTE: This function returns a static buffer and thus is not thread-safe.
+ */
 static boolean_t
 nfs_is_shared(sa_share_impl_t impl_share)
 {
-	char *s, last, line[MAXLINESIZE];
+	static char line[MAXLINESIZE];
+	char *s, last;
 	size_t len;
 	char *mntpoint = impl_share->sa_mountpoint;
 	size_t mntlen = strlen(mntpoint);

lib/libshare/os/linux/nfs.c

@@ -65,22 +65,17 @@ static int nfs_lock_fd = -1;
 static int
 nfs_exports_lock(void)
 {
-	int err;
-
 	nfs_lock_fd = open(ZFS_EXPORTS_LOCK,
 	    O_RDWR | O_CREAT, 0600);
 	if (nfs_lock_fd == -1) {
-		err = errno;
 		fprintf(stderr, "failed to lock %s: %s\n",
-		    ZFS_EXPORTS_LOCK, strerror(err));
-		return (err);
+		    ZFS_EXPORTS_LOCK, strerror(errno));
+		return (errno);
 	}
 	if (flock(nfs_lock_fd, LOCK_EX) != 0) {
-		err = errno;
 		fprintf(stderr, "failed to lock %s: %s\n",
-		    ZFS_EXPORTS_LOCK, strerror(err));
-		(void) close(nfs_lock_fd);
-		return (err);
+		    ZFS_EXPORTS_LOCK, strerror(errno));
+		return (errno);
 	}
 	return (0);
 }

lib/libspl/Makefile.am

@@ -55,12 +55,3 @@ libspl_la_LIBADD = \
 	libspl_assert.la
 
 libspl_la_LIBADD += $(LIBCLOCK_GETTIME)
-
-include $(top_srcdir)/config/CppCheck.am
-
-# Override the default SOURCES which includes TARGET_CPU_ATOMIC_SOURCE
-# in order to always evaluate the generic asm-generic/atomic.c source.
-CPPCHECKSRC = $(USER_C) asm-generic/atomic.c
-cppcheck:
-	$(CPPCHECK) -j$(CPU_COUNT) $(CPPCHECKFLAGS) --force \
-		$(DEFAULT_INCLUDES) $(CPPCHECKSRC)

lib/libtpool/Makefile.am

@@ -7,5 +7,3 @@ USER_C = \
 	thread_pool_impl.h
 
 libtpool_la_SOURCES = $(USER_C)
-
-include $(top_srcdir)/config/CppCheck.am

lib/libunicode/Makefile.am

@@ -13,5 +13,3 @@ KERNEL_C = \
 
 nodist_libunicode_la_SOURCES = \
 	$(KERNEL_C)
-
-include $(top_srcdir)/config/CppCheck.am

lib/libuutil/Makefile.am

@@ -1,4 +1,5 @@
 include $(top_srcdir)/config/Rules.am
+PHONY =
 
 lib_LTLIBRARIES = libuutil.la
 
@@ -31,7 +32,5 @@ endif
 
 libuutil_la_LDFLAGS += -version-info 3:0:0
 
-include $(top_srcdir)/config/CppCheck.am
-
 # Library ABI
 EXTRA_DIST = libuutil.abi libuutil.suppr

lib/libzfs/Makefile.am

@@ -1,4 +1,5 @@
 include $(top_srcdir)/config/Rules.am
+PHONY =
 
 VPATH = \
 	$(top_srcdir)/module/icp \
@@ -89,8 +90,6 @@ endif
 
 libzfs_la_LDFLAGS += -version-info 4:0:0
 
-include $(top_srcdir)/config/CppCheck.am
-
 # Library ABI
 EXTRA_DIST = libzfs.abi libzfs.suppr
 

lib/libzfs/libzfs_crypto.c

@@ -518,7 +518,7 @@ get_key_material(libzfs_handle_t *hdl, boolean_t do_verify, boolean_t newkey,
 	switch (keyloc) {
 	case ZFS_KEYLOCATION_PROMPT:
 		if (isatty(fileno(stdin))) {
-			can_retry = keyformat != ZFS_KEYFORMAT_RAW;
+			can_retry = B_TRUE;
 			ret = get_key_interactive(hdl, fsname, keyformat,
 			    do_verify, newkey, &km, &kmlen);
 		} else {
@@ -532,8 +532,6 @@ get_key_material(libzfs_handle_t *hdl, boolean_t do_verify, boolean_t newkey,
 
 		break;
 	case ZFS_KEYLOCATION_URI:
-		ret = ENOTSUP;
-
 		for (handler = uri_handlers; handler->zuh_scheme != NULL;
 		    handler++) {
 			if (strcmp(handler->zuh_scheme, uri_scheme) != 0)
@@ -546,11 +544,9 @@ get_key_material(libzfs_handle_t *hdl, boolean_t do_verify, boolean_t newkey,
 			break;
 		}
 
-		if (ret == ENOTSUP) {
-			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-			    "URI scheme is not supported"));
-			goto error;
-		}
+		ret = ENOTSUP;
+		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+		    "URI scheme is not supported"));
 
 		break;
 	default:
@@ -960,7 +956,7 @@ zfs_crypto_create(libzfs_handle_t *hdl, char *parent_name, nvlist_t *props,
 		}
 
 		ret = populate_create_encryption_params_nvlists(hdl, NULL,
-		    B_TRUE, keyformat, keylocation, props, &wkeydata,
+		    B_FALSE, keyformat, keylocation, props, &wkeydata,
 		    &wkeylen);
 		if (ret != 0)
 			goto out;

lib/libzfs/libzfs_dataset.c

@@ -32,7 +32,6 @@
  * Copyright 2017-2018 RackTop Systems.
  * Copyright (c) 2019 Datto Inc.
  * Copyright (c) 2019, loli10K <ezomori.nozomu@gmail.com>
- * Copyright (c) 2021 Matt Fiddaman
  */
 
 #include <ctype.h>
@@ -813,7 +812,7 @@ libzfs_mnttab_update(libzfs_handle_t *hdl)
 	struct mnttab entry;
 
 	/* Reopen MNTTAB to prevent reading stale data from open file */
-	if (freopen(MNTTAB, "re", hdl->libzfs_mnttab) == NULL)
+	if (freopen(MNTTAB, "r", hdl->libzfs_mnttab) == NULL)
 		return (ENOENT);
 
 	while (getmntent(hdl->libzfs_mnttab, &entry) == 0) {
@@ -884,7 +883,7 @@ libzfs_mnttab_find(libzfs_handle_t *hdl, const char *fsname,
 			libzfs_mnttab_fini(hdl);
 
 		/* Reopen MNTTAB to prevent reading stale data from open file */
-		if (freopen(MNTTAB, "re", hdl->libzfs_mnttab) == NULL)
+		if (freopen(MNTTAB, "r", hdl->libzfs_mnttab) == NULL)
 			return (ENOENT);
 
 		srch.mnt_special = (char *)fsname;
@@ -1955,7 +1954,6 @@ zfs_prop_inherit(zfs_handle_t *zhp, const char *propname, boolean_t received)
 		if (zfs_ioctl(zhp->zfs_hdl, ZFS_IOC_INHERIT_PROP, &zc) != 0)
 			return (zfs_standard_error(hdl, errno, errbuf));
 
-		(void) get_stats(zhp);
 		return (0);
 	}
 
@@ -2389,7 +2387,7 @@ get_clones_string(zfs_handle_t *zhp, char *propbuf, size_t proplen)
 	nvpair_t *pair;
 
 	value = zfs_get_clones_nvl(zhp);
-	if (value == NULL || nvlist_empty(value))
+	if (value == NULL)
 		return (-1);
 
 	propbuf[0] = '\0';

lib/libzfs/libzfs_mount.c

@@ -385,9 +385,6 @@ zfs_mount_at(zfs_handle_t *zhp, const char *options, int flags,
 	struct stat buf;
 	char mntopts[MNT_LINE_MAX];
 	char overlay[ZFS_MAXPROPLEN];
-	char prop_encroot[MAXNAMELEN];
-	boolean_t is_encroot;
-	zfs_handle_t *encroot_hp = zhp;
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
 	uint64_t keystatus;
 	int remount = 0, rc;
@@ -446,27 +443,7 @@ zfs_mount_at(zfs_handle_t *zhp, const char *options, int flags,
 		 */
 		if (keystatus == ZFS_KEYSTATUS_UNAVAILABLE) {
 			if (flags & MS_CRYPT) {
-				rc = zfs_crypto_get_encryption_root(zhp,
-				    &is_encroot, prop_encroot);
-				if (rc) {
-					zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-					    "Failed to get encryption root for "
-					    "'%s'."), zfs_get_name(zhp));
-					return (rc);
-				}
-
-				if (!is_encroot) {
-					encroot_hp = zfs_open(hdl, prop_encroot,
-					    ZFS_TYPE_DATASET);
-					if (encroot_hp == NULL)
-						return (hdl->libzfs_error);
-				}
-
-				rc = zfs_crypto_load_key(encroot_hp,
-				    B_FALSE, NULL);
-
-				if (!is_encroot)
-					zfs_close(encroot_hp);
+				rc = zfs_crypto_load_key(zhp, B_FALSE, NULL);
 				if (rc)
 					return (rc);
 			} else {
@@ -1519,7 +1496,7 @@ zpool_disable_datasets(zpool_handle_t *zhp, boolean_t force)
 	namelen = strlen(zhp->zpool_name);
 
 	/* Reopen MNTTAB to prevent reading stale data from open file */
-	if (freopen(MNTTAB, "re", hdl->libzfs_mnttab) == NULL)
+	if (freopen(MNTTAB, "r", hdl->libzfs_mnttab) == NULL)
 		return (ENOENT);
 
 	used = alloc = 0;

lib/libzfs/libzfs_sendrecv.c

@@ -321,15 +321,6 @@ send_iterate_snap(zfs_handle_t *zhp, void *arg)
 	}
 
 	if (!sd->recursive) {
-
-		/*
-		 * To allow a doall stream to work properly
-		 * with a NULL fromsnap
-		 */
-		if (sd->doall && sd->fromsnap == NULL && !sd->seenfrom) {
-			sd->seenfrom = B_TRUE;
-		}
-
 		if (!sd->seenfrom && isfromsnap) {
 			sd->seenfrom = B_TRUE;
 			zfs_close(zhp);
@@ -3956,6 +3947,24 @@ zfs_setup_cmdline_props(libzfs_handle_t *hdl, zfs_type_t type,
 		if (prop == ZFS_PROP_ORIGIN)
 			continue;
 
+		/*
+		 * we're trying to override or exclude a property that does not
+		 * make sense for this type of dataset, but we don't want to
+		 * fail if the receive is recursive: this comes in handy when
+		 * the send stream contains, for instance, a child ZVOL and
+		 * we're trying to receive it with "-o atime=on"
+		 */
+		if (!zfs_prop_valid_for_type(prop, type, B_FALSE) &&
+		    !zfs_prop_user(name)) {
+			if (recursive)
+				continue;
+			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+			    "property '%s' does not apply to datasets of this "
+			    "type"), name);
+			ret = zfs_error(hdl, EZFS_BADPROP, errbuf);
+			goto error;
+		}
+
 		/* raw streams can't override encryption properties */
 		if ((zfs_prop_encryption_key_param(prop) ||
 		    prop == ZFS_PROP_ENCRYPTION) && raw) {
@@ -3984,16 +3993,6 @@ zfs_setup_cmdline_props(libzfs_handle_t *hdl, zfs_type_t type,
 			 * a property: this is done by forcing an explicit
 			 * inherit on the destination so the effective value is
 			 * not the one we received from the send stream.
-			 */
-			if (!zfs_prop_valid_for_type(prop, type, B_FALSE) &&
-			    !zfs_prop_user(name)) {
-				(void) fprintf(stderr, dgettext(TEXT_DOMAIN,
-				    "Warning: %s: property '%s' does not "
-				    "apply to datasets of this type\n"),
-				    fsname, name);
-				continue;
-			}
-			/*
 			 * We do this only if the property is not already
 			 * locally-set, in which case its value will take
 			 * priority over the received anyway.
@@ -4021,24 +4020,6 @@ zfs_setup_cmdline_props(libzfs_handle_t *hdl, zfs_type_t type,
 				fnvlist_add_nvpair(*oxprops, nvp);
 			break;
 		case DATA_TYPE_STRING: /* -o property=value */
-			/*
-			 * we're trying to override a property that does not
-			 * make sense for this type of dataset, but we don't
-			 * want to fail if the receive is recursive: this comes
-			 * in handy when the send stream contains, for
-			 * instance, a child ZVOL and we're trying to receive
-			 * it with "-o atime=on"
-			 */
-			if (!zfs_prop_valid_for_type(prop, type, B_FALSE) &&
-			    !zfs_prop_user(name)) {
-				if (recursive)
-					continue;
-				zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-				    "property '%s' does not apply to datasets "
-				    "of this type"), name);
-				ret = zfs_error(hdl, EZFS_BADPROP, errbuf);
-				goto error;
-			}
 			fnvlist_add_nvpair(oprops, nvp);
 			break;
 		default:

lib/libzfs/libzfs_util.c

@@ -1024,15 +1024,15 @@ libzfs_init(void)
 		return (NULL);
 	}
 
-	if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR|O_EXCL|O_CLOEXEC)) < 0) {
+	if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR|O_EXCL)) < 0) {
 		free(hdl);
 		return (NULL);
 	}
 
 #ifdef HAVE_SETMNTENT
-	if ((hdl->libzfs_mnttab = setmntent(MNTTAB, "re")) == NULL) {
+	if ((hdl->libzfs_mnttab = setmntent(MNTTAB, "r")) == NULL) {
 #else
-	if ((hdl->libzfs_mnttab = fopen(MNTTAB, "re")) == NULL) {
+	if ((hdl->libzfs_mnttab = fopen(MNTTAB, "r")) == NULL) {
 #endif
 		(void) close(hdl->libzfs_fd);
 		free(hdl);

lib/libzfs_core/Makefile.am

@@ -1,4 +1,5 @@
 include $(top_srcdir)/config/Rules.am
+PHONY =
 
 pkgconfig_DATA = libzfs_core.pc
 
@@ -29,7 +30,5 @@ endif
 
 libzfs_core_la_LDFLAGS += -version-info 3:0:0
 
-include $(top_srcdir)/config/CppCheck.am
-
 # Library ABI
 EXTRA_DIST = libzfs_core.abi libzfs_core.suppr

lib/libzfs_core/libzfs_core.c

@@ -137,7 +137,7 @@ libzfs_core_init(void)
 {
 	(void) pthread_mutex_lock(&g_lock);
 	if (g_refcount == 0) {
-		g_fd = open(ZFS_DEV, O_RDWR|O_CLOEXEC);
+		g_fd = open(ZFS_DEV, O_RDWR);
 		if (g_fd < 0) {
 			(void) pthread_mutex_unlock(&g_lock);
 			return (errno);

lib/libzfsbootenv/Makefile.am

@@ -1,4 +1,5 @@
 include $(top_srcdir)/config/Rules.am
+PHONY =
 
 pkgconfig_DATA = libzfsbootenv.pc
 
@@ -33,7 +34,5 @@ endif
 
 libzfsbootenv_la_LDFLAGS += -version-info 1:0:0
 
-include $(top_srcdir)/config/CppCheck.am
-
 # Library ABI
 EXTRA_DIST = libzfsbootenv.abi libzfsbootenv.suppr

lib/libzpool/Makefile.am

@@ -161,7 +161,6 @@ KERNEL_C = \
 	zfs_debug.c \
 	zfs_fm.c \
 	zfs_fuid.c \
-	zfs_racct.c \
 	zfs_sa.c \
 	zfs_znode.c \
 	zfs_ratelimit.c \
@@ -234,5 +233,3 @@ if TARGET_CPU_POWERPC
 vdev_raidz_math_powerpc_altivec.$(OBJEXT): CFLAGS += -maltivec
 vdev_raidz_math_powerpc_altivec.l$(OBJEXT): CFLAGS += -maltivec
 endif
-
-include $(top_srcdir)/config/CppCheck.am

lib/libzpool/util.c

@@ -159,7 +159,7 @@ set_global_var(char *arg)
 	char *varname = arg, *varval;
 	u_longlong_t val;
 
-#ifndef _ZFS_LITTLE_ENDIAN
+#ifndef _LITTLE_ENDIAN
 	/*
 	 * On big endian systems changing a 64-bit variable would set the high
 	 * 32 bits instead of the low 32 bits, which could cause unexpected

lib/libzstd/Makefile.am

@@ -19,5 +19,3 @@ lib/zstd.l$(OBJEXT): CFLAGS += -fno-tree-vectorize -include $(top_srcdir)/module
 
 zfs_zstd.$(OBJEXT):  CFLAGS += -include $(top_srcdir)/module/zstd/include/zstd_compat_wrapper.h
 zfs_zstd.l$(OBJEXT): CFLAGS += -include $(top_srcdir)/module/zstd/include/zstd_compat_wrapper.h
-
-include $(top_srcdir)/config/CppCheck.am

lib/libzutil/Makefile.am

@@ -49,5 +49,3 @@ libzutil_la_LIBADD += \
 endif
 
 libzutil_la_LIBADD += -lm $(LIBBLKID_LIBS) $(LIBUDEV_LIBS)
-
-include $(top_srcdir)/config/CppCheck.am

lib/libzutil/zutil_import.c

@@ -1225,8 +1225,7 @@ error:
  * to import a specific pool.
  */
 static nvlist_t *
-zpool_find_import_impl(libpc_handle_t *hdl, importargs_t *iarg,
-    pthread_mutex_t *lock, avl_tree_t *cache)
+zpool_find_import_impl(libpc_handle_t *hdl, importargs_t *iarg)
 {
 	nvlist_t *ret = NULL;
 	pool_list_t pools = { 0 };
@@ -1234,11 +1233,34 @@ zpool_find_import_impl(libpc_handle_t *hdl, importargs_t *iarg,
 	vdev_entry_t *ve, *venext;
 	config_entry_t *ce, *cenext;
 	name_entry_t *ne, *nenext;
+	pthread_mutex_t lock;
+	avl_tree_t *cache;
 	rdsk_node_t *slice;
 	void *cookie;
 	tpool_t *t;
 
 	verify(iarg->poolname == NULL || iarg->guid == 0);
+	pthread_mutex_init(&lock, NULL);
+
+	/*
+	 * Locate pool member vdevs by blkid or by directory scanning.
+	 * On success a newly allocated AVL tree which is populated with an
+	 * entry for each discovered vdev will be returned in the cache.
+	 * It's the caller's responsibility to consume and destroy this tree.
+	 */
+	if (iarg->scan || iarg->paths != 0) {
+		size_t dirs = iarg->paths;
+		const char * const *dir = (const char * const *)iarg->path;
+
+		if (dirs == 0)
+			dir = zpool_default_search_paths(&dirs);
+
+		if (zpool_find_import_scan(hdl, &lock, &cache, dir, dirs) != 0)
+			return (NULL);
+	} else {
+		if (zpool_find_import_blkid(hdl, &lock, &cache) != 0)
+			return (NULL);
+	}
 
 	/*
 	 * Create a thread pool to parallelize the process of reading and
@@ -1318,6 +1340,7 @@ zpool_find_import_impl(libpc_handle_t *hdl, importargs_t *iarg,
 	}
 	avl_destroy(cache);
 	free(cache);
+	pthread_mutex_destroy(&lock);
 
 	ret = get_configs(hdl, &pools, iarg->can_be_active, iarg->policy);
 
@@ -1344,43 +1367,14 @@ zpool_find_import_impl(libpc_handle_t *hdl, importargs_t *iarg,
 	return (ret);
 }
 
-/*
- * Given a config, discover the paths for the devices which
- * exist in the config.
- */
-static int
-discover_cached_paths(libpc_handle_t *hdl, nvlist_t *nv,
-    avl_tree_t *cache, pthread_mutex_t *lock)
-{
-	char *path = NULL;
-	uint_t children;
-	nvlist_t **child;
-
-	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_CHILDREN,
-	    &child, &children) == 0) {
-		for (int c = 0; c < children; c++) {
-			discover_cached_paths(hdl, child[c], cache, lock);
-		}
-	}
-
-	/*
-	 * Once we have the path, we need to add the directory to
-	 * our directoy cache.
-	 */
-	if (nvlist_lookup_string(nv, ZPOOL_CONFIG_PATH, &path) == 0) {
-		return (zpool_find_import_scan_dir(hdl, lock, cache,
-		    dirname(path), 0));
-	}
-	return (0);
-}
-
 /*
  * Given a cache file, return the contents as a list of importable pools.
  * poolname or guid (but not both) are provided by the caller when trying
  * to import a specific pool.
  */
 static nvlist_t *
-zpool_find_import_cached(libpc_handle_t *hdl, importargs_t *iarg)
+zpool_find_import_cached(libpc_handle_t *hdl, const char *cachefile,
+    const char *poolname, uint64_t guid)
 {
 	char *buf;
 	int fd;
@@ -1392,9 +1386,9 @@ zpool_find_import_cached(libpc_handle_t *hdl, importargs_t *iarg)
 	uint64_t this_guid;
 	boolean_t active;
 
-	verify(iarg->poolname == NULL || iarg->guid == 0);
+	verify(poolname == NULL || guid == 0);
 
-	if ((fd = open(iarg->cachefile, O_RDONLY)) < 0) {
+	if ((fd = open(cachefile, O_RDONLY)) < 0) {
 		zutil_error_aux(hdl, "%s", strerror(errno));
 		(void) zutil_error(hdl, EZFS_BADCACHE,
 		    dgettext(TEXT_DOMAIN, "failed to open cache file"));
@@ -1450,11 +1444,11 @@ zpool_find_import_cached(libpc_handle_t *hdl, importargs_t *iarg)
 		src = fnvpair_value_nvlist(elem);
 
 		name = fnvlist_lookup_string(src, ZPOOL_CONFIG_POOL_NAME);
-		if (iarg->poolname != NULL && strcmp(iarg->poolname, name) != 0)
+		if (poolname != NULL && strcmp(poolname, name) != 0)
 			continue;
 
 		this_guid = fnvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID);
-		if (iarg->guid != 0 && iarg->guid != this_guid)
+		if (guid != 0 && guid != this_guid)
 			continue;
 
 		if (zutil_pool_active(hdl, name, this_guid, &active) != 0) {
@@ -1466,68 +1460,8 @@ zpool_find_import_cached(libpc_handle_t *hdl, importargs_t *iarg)
 		if (active)
 			continue;
 
-		if (iarg->scan) {
-			uint64_t saved_guid = iarg->guid;
-			const char *saved_poolname = iarg->poolname;
-			pthread_mutex_t lock;
-
-			/*
-			 * Create the device cache that will hold the
-			 * devices we will scan based on the cachefile.
-			 * This will get destroyed and freed by
-			 * zpool_find_import_impl.
-			 */
-			avl_tree_t *cache = zutil_alloc(hdl,
-			    sizeof (avl_tree_t));
-			avl_create(cache, slice_cache_compare,
-			    sizeof (rdsk_node_t),
-			    offsetof(rdsk_node_t, rn_node));
-			nvlist_t *nvroot = fnvlist_lookup_nvlist(src,
-			    ZPOOL_CONFIG_VDEV_TREE);
-
-			/*
-			 * We only want to find the pool with this_guid.
-			 * We will reset these values back later.
-			 */
-			iarg->guid = this_guid;
-			iarg->poolname = NULL;
-
-			/*
-			 * We need to build up a cache of devices that exists
-			 * in the paths pointed to by the cachefile. This allows
-			 * us to preserve the device namespace that was
-			 * originally specified by the user but also lets us
-			 * scan devices in those directories in case they had
-			 * been renamed.
-			 */
-			pthread_mutex_init(&lock, NULL);
-			discover_cached_paths(hdl, nvroot, cache, &lock);
-			nvlist_t *nv = zpool_find_import_impl(hdl, iarg,
-			    &lock, cache);
-			pthread_mutex_destroy(&lock);
-
-			/*
-			 * zpool_find_import_impl will return back
-			 * a list of pools that it found based on the
-			 * device cache. There should only be one pool
-			 * since we're looking for a specific guid.
-			 * We will use that pool to build up the final
-			 * pool nvlist which is returned back to the
-			 * caller.
-			 */
-			nvpair_t *pair = nvlist_next_nvpair(nv, NULL);
-			fnvlist_add_nvlist(pools, nvpair_name(pair),
-			    fnvpair_value_nvlist(pair));
-
-			VERIFY3P(nvlist_next_nvpair(nv, pair), ==, NULL);
-
-			iarg->guid = saved_guid;
-			iarg->poolname = saved_poolname;
-			continue;
-		}
-
 		if (nvlist_add_string(src, ZPOOL_CONFIG_CACHEFILE,
-		    iarg->cachefile) != 0) {
+		    cachefile) != 0) {
 			(void) zutil_no_memory(hdl);
 			nvlist_free(raw);
 			nvlist_free(pools);
@@ -1549,51 +1483,11 @@ zpool_find_import_cached(libpc_handle_t *hdl, importargs_t *iarg)
 		}
 		nvlist_free(dst);
 	}
+
 	nvlist_free(raw);
 	return (pools);
 }
 
-static nvlist_t *
-zpool_find_import(libpc_handle_t *hdl, importargs_t *iarg)
-{
-	pthread_mutex_t lock;
-	avl_tree_t *cache;
-	nvlist_t *pools = NULL;
-
-	verify(iarg->poolname == NULL || iarg->guid == 0);
-	pthread_mutex_init(&lock, NULL);
-
-	/*
-	 * Locate pool member vdevs by blkid or by directory scanning.
-	 * On success a newly allocated AVL tree which is populated with an
-	 * entry for each discovered vdev will be returned in the cache.
-	 * It's the caller's responsibility to consume and destroy this tree.
-	 */
-	if (iarg->scan || iarg->paths != 0) {
-		size_t dirs = iarg->paths;
-		const char * const *dir = (const char * const *)iarg->path;
-
-		if (dirs == 0)
-			dir = zpool_default_search_paths(&dirs);
-
-		if (zpool_find_import_scan(hdl, &lock, &cache,
-		    dir, dirs) != 0) {
-			pthread_mutex_destroy(&lock);
-			return (NULL);
-		}
-	} else {
-		if (zpool_find_import_blkid(hdl, &lock, &cache) != 0) {
-			pthread_mutex_destroy(&lock);
-			return (NULL);
-		}
-	}
-
-	pools = zpool_find_import_impl(hdl, iarg, &lock, cache);
-	pthread_mutex_destroy(&lock);
-	return (pools);
-}
-
-
 nvlist_t *
 zpool_search_import(void *hdl, importargs_t *import,
     const pool_config_ops_t *pco)
@@ -1608,9 +1502,10 @@ zpool_search_import(void *hdl, importargs_t *import,
 	verify(import->poolname == NULL || import->guid == 0);
 
 	if (import->cachefile != NULL)
-		pools = zpool_find_import_cached(&handle, import);
+		pools = zpool_find_import_cached(&handle, import->cachefile,
+		    import->poolname, import->guid);
 	else
-		pools = zpool_find_import(&handle, import);
+		pools = zpool_find_import_impl(&handle, import);
 
 	if ((pools == NULL || nvlist_empty(pools)) &&
 	    handle.lpc_open_access_error && geteuid() != 0) {

lib/libzutil/zutil_nicenum.c

@@ -35,9 +35,6 @@
 boolean_t
 zfs_isnumber(const char *str)
 {
-	if (!*str)
-		return (B_FALSE);
-
 	for (; *str; str++)
 		if (!(isdigit(*str) || (*str == '.')))
 			return (B_FALSE);

man/man5/zfs-module-parameters.5

@@ -14,7 +14,7 @@
 .\" CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your
 .\" own identifying information:
 .\" Portions Copyright [yyyy] [name of copyright owner]
-.TH ZFS-MODULE-PARAMETERS 5 "Mar 31, 2021" OpenZFS
+.TH ZFS-MODULE-PARAMETERS 5 "Aug 24, 2020" OpenZFS
 .SH NAME
 zfs\-module\-parameters \- ZFS module parameters
 .SH DESCRIPTION
@@ -1186,7 +1186,7 @@ amount of memory. When the limit is exceeded, the ioctl fails with EINVAL and a
 description of the error is sent to the zfs-dbgmsg log. This parameter should
 not need to be touched under normal circumstances. On FreeBSD, the default is
 based on the system limit on user wired memory. On Linux, the default is
-\fB128MB\fR.
+\fBKMALLOC_MAX_SIZE\fR .
 .sp
 Default value: \fB0\fR (kernel decides)
 .RE
@@ -1370,19 +1370,6 @@ to throttle vdev removal speed.
 Default value: \fB0\fR (no throttle).
 .RE
 
-.sp
-.ne 2
-.na
-\fBzfs_condense_indirect_obsolete_pct\fR (int)
-.ad
-.RS 12n
-Minimum percent of obsolete bytes in vdev mapping required to attempt to
-condense (see \fBzfs_condense_indirect_vdevs_enable\fR). Intended for use
-with the test suite to facilitate triggering condensing as needed.
-.sp
-Default value: \fB25\fR%.
-.RE
-
 .sp
 .ne 2
 .na
@@ -1633,8 +1620,7 @@ Default value: \fB64\fR.
 \fBzfs_slow_io_events_per_second\fR (int)
 .ad
 .RS 12n
-Rate limit delay and deadman zevents (which report slow I/Os) to this many per
-second.
+Rate limit delay zevents (which report slow I/Os) to this many per second.
 .sp
 Default value: 20
 .RE
@@ -3759,10 +3745,11 @@ Use \fB1\fR for yes and \fB0\fR for no (default).
 \fBzfs_zevent_len_max\fR (int)
 .ad
 .RS 12n
-Max event queue length.
-Events in the queue can be viewed with the \fBzpool events\fR command.
+Max event queue length. A value of 0 will result in a calculated value which
+increases with the number of CPUs in the system (minimum 64 events). Events
+in the queue can be viewed with the \fBzpool events\fR command.
 .sp
-Default value: \fB512\fR.
+Default value: \fB0\fR.
 .RE
 
 .sp