Raidz rebase on upstream zfs-0.8-release

.github/CONTRIBUTING.md

@@ -51,7 +51,7 @@ configure option should be set. This will enable additional correctness
 checks and all the ASSERTs to help quickly catch potential issues.
 
 In addition, there are numerous utilities and debugging files which
-provide visibility in to the inner workings of ZFS.  The most useful
+provide visibility into the inner workings of ZFS.  The most useful
 of these tools are discussed in detail on the [debugging ZFS wiki
 page](https://github.com/zfsonlinux/zfs/wiki/Debugging).
 

.gitignore

@@ -36,6 +36,7 @@ Makefile.in
 # Top level generated files specific to this top level dir
 #
 /bin
+/build
 /configure
 /config.log
 /config.status
@@ -62,4 +63,3 @@ cscope.*
 *.orig
 *.log
 venv
-

META

@@ -1,10 +1,10 @@
 Meta:          1
 Name:          zfs
 Branch:        1.0
-Version:       0.8.0
+Version:       0.8.3
 Release:       1
 Release-Tags:  relext
 License:       CDDL
 Author:        OpenZFS on Linux
-Linux-Maximum: 5.1
+Linux-Maximum: 5.4
 Linux-Minimum: 2.6.32

Makefile.am

@@ -25,11 +25,16 @@ EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md
 EXTRA_DIST += CODE_OF_CONDUCT.md
 
 # Include all the extra licensing information for modules
-EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE module/icp/algs/skein/THIRDPARTYLICENSE.descrip
-EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
-EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
-EXTRA_DIST += module/spl/THIRDPARTYLICENSE.gplv2 module/spl/THIRDPARTYLICENSE.gplv2.descrip
-EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash module/zfs/THIRDPARTYLICENSE.cityhash.descrip
+EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE
+EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE.descrip
+EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
+EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
+EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
+EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
+EXTRA_DIST += module/spl/THIRDPARTYLICENSE.gplv2
+EXTRA_DIST += module/spl/THIRDPARTYLICENSE.gplv2.descrip
+EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash
+EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash.descrip
 
 @CODE_COVERAGE_RULES@
 
@@ -39,8 +44,9 @@ gitrev:
 
 BUILT_SOURCES = gitrev
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
-	-$(RM) -R autom4te*.cache
+	-$(RM) -R autom4te*.cache build
 	-find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
 		-o -name .pc -o -name .hg -o -name .git \) -prune -o \
 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
@@ -52,7 +58,8 @@ distclean-local::
 		-type f -print | xargs $(RM)
 
 all-local:
-	-${top_srcdir}/scripts/zfs-tests.sh -c
+	-[ -x ${top_builddir}/scripts/zfs-tests.sh ] && \
+	    ${top_builddir}/scripts/zfs-tests.sh -c
 
 dist-hook: gitrev
 	cp ${top_srcdir}/include/zfs_gitrev.h $(distdir)/include; \
@@ -86,8 +93,8 @@ commitcheck:
 	fi
 
 cstyle:
-	@find ${top_srcdir} -name '*.[hc]' ! -name 'zfs_config.*' \
-		! -name '*.mod.c' -type f \
+	@find ${top_srcdir} -name build -prune -o -name '*.[hc]' \
+		! -name 'zfs_config.*' ! -name '*.mod.c' -type f \
 		-exec ${top_srcdir}/scripts/cstyle.pl -cpP {} \+
 
 shellcheck:
@@ -111,9 +118,10 @@ mancheck:
 	fi
 
 testscheck:
-	@find ${top_srcdir}/tests/zfs-tests/tests -type f \
+	@find ${top_srcdir}/tests/zfs-tests -type f \
 		\( -name '*.ksh' -not -executable \) -o \
 		\( -name '*.kshlib' -executable \) -o \
+		\( -name '*.shlib' -executable \) -o \
 		\( -name '*.cfg' -executable \) | \
 		xargs -r stat -c '%A %n' | \
 		awk '{c++; print} END {if(c>0) exit 1}'

cmd/Makefile.am

@@ -1,3 +1,8 @@
 SUBDIRS  = zfs zpool zdb zhack zinject zstreamdump ztest
-SUBDIRS += mount_zfs fsck_zfs zvol_id vdev_id arcstat dbufstat zed
-SUBDIRS += arc_summary zgenhostid
+SUBDIRS += fsck_zfs vdev_id zgenhostid
+
+if USING_PYTHON
+SUBDIRS += arcstat arc_summary dbufstat
+endif
+
+SUBDIRS += mount_zfs zed zvol_id zvol_wait

cmd/arc_summary/Makefile.am

@@ -4,9 +4,7 @@ if USING_PYTHON_2
 dist_bin_SCRIPTS = arc_summary2
 install-exec-hook:
 	mv $(DESTDIR)$(bindir)/arc_summary2 $(DESTDIR)$(bindir)/arc_summary
-endif
-
-if USING_PYTHON_3
+else
 dist_bin_SCRIPTS = arc_summary3
 install-exec-hook:
 	mv $(DESTDIR)$(bindir)/arc_summary3 $(DESTDIR)$(bindir)/arc_summary

cmd/arc_summary/arc_summary2

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 #
 # $Id: arc_summary.pl,v 388:e27800740aa2 2011-07-08 02:53:29Z jhell $
 #

cmd/arc_summary/arc_summary3

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 #
 # Copyright (c) 2008 Ben Rockwood <benr@cuddletech.com>,
 # Copyright (c) 2010 Martin Matuska <mm@FreeBSD.org>,
@@ -43,7 +43,7 @@ import subprocess
 import sys
 import time
 
-DECRIPTION = 'Print ARC and other statistics for ZFS on Linux'
+DESCRIPTION = 'Print ARC and other statistics for ZFS on Linux'
 INDENT = ' '*8
 LINE_LENGTH = 72
 PROC_PATH = '/proc/spl/kstat/zfs/'
@@ -65,7 +65,7 @@ SECTION_PATHS = {'arc': 'arcstats',
                  'zfetch': 'zfetchstats',
                  'zil': 'zil'}
 
-parser = argparse.ArgumentParser(description=DECRIPTION)
+parser = argparse.ArgumentParser(description=DESCRIPTION)
 parser.add_argument('-a', '--alternate', action='store_true', default=False,
                     help='use alternate formatting for tunables and SPL',
                     dest='alt')
@@ -284,7 +284,7 @@ def get_spl_tunables(PATH):
 
 
 def get_descriptions(request):
-    """Get the decriptions of the Solaris Porting Layer (SPL) or the
+    """Get the descriptions of the Solaris Porting Layer (SPL) or the
     tunables, return with minimal formatting.
     """
 
@@ -677,10 +677,10 @@ def section_l2arc(kstats_dict):
     prt_1('L2ARC breakdown:', f_hits(l2_access_total))
     prt_i2('Hit ratio:',
            f_perc(arc_stats['l2_hits'], l2_access_total),
-           f_bytes(arc_stats['l2_hits']))
+           f_hits(arc_stats['l2_hits']))
     prt_i2('Miss ratio:',
            f_perc(arc_stats['l2_misses'], l2_access_total),
-           f_bytes(arc_stats['l2_misses']))
+           f_hits(arc_stats['l2_misses']))
     prt_i1('Feeds:', f_hits(arc_stats['l2_feeds']))
 
     print()
@@ -708,7 +708,7 @@ def section_l2arc(kstats_dict):
 
 def section_spl(*_):
     """Print the SPL parameters, if requested with alternative format
-    and/or decriptions. This does not use kstats.
+    and/or descriptions. This does not use kstats.
     """
 
     spls = get_spl_tunables(SPL_PATH)
@@ -725,7 +725,7 @@ def section_spl(*_):
             try:
                 print(INDENT+'#', descriptions[key])
             except KeyError:
-                print(INDENT+'# (No decription found)')  # paranoid
+                print(INDENT+'# (No description found)')  # paranoid
 
         print(format_raw_line(key, value))
 
@@ -734,7 +734,7 @@ def section_spl(*_):
 
 def section_tunables(*_):
     """Print the tunables, if requested with alternative format and/or
-    decriptions. This does not use kstasts.
+    descriptions. This does not use kstasts.
     """
 
     tunables = get_spl_tunables(TUNABLES_PATH)
@@ -751,7 +751,7 @@ def section_tunables(*_):
             try:
                 print(INDENT+'#', descriptions[key])
             except KeyError:
-                print(INDENT+'# (No decription found)')  # paranoid
+                print(INDENT+'# (No description found)')  # paranoid
 
         print(format_raw_line(key, value))
 

cmd/arcstat/Makefile.am

@@ -1,13 +1,13 @@
 dist_bin_SCRIPTS = arcstat
 
 #
-# The arcstat script is compatibile with both Python 2.6 and 3.4.
+# The arcstat script is compatible with both Python 2.6 and 3.4.
 # As such the python 3 shebang can be replaced at install time when
 # targeting a python 2 system.  This allows us to maintain a single
 # version of the source.
 #
 if USING_PYTHON_2
 install-exec-hook:
-	sed --in-place 's|^#!/usr/bin/python3|#!/usr/bin/python2|' \
+	sed --in-place 's|^#!/usr/bin/env python3|#!/usr/bin/env python2|' \
 	    $(DESTDIR)$(bindir)/arcstat
 endif

cmd/arcstat/arcstat

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 #
 # Print out ZFS ARC Statistics exported via kstat(1)
 # For a definition of fields, or usage, use arctstat.pl -v

cmd/dbufstat/Makefile.am

@@ -1,13 +1,13 @@
 dist_bin_SCRIPTS = dbufstat
 
 #
-# The dbufstat script is compatibile with both Python 2.6 and 3.4.
+# The dbufstat script is compatible with both Python 2.6 and 3.4.
 # As such the python 3 shebang can be replaced at install time when
 # targeting a python 2 system.  This allows us to maintain a single
 # version of the source.
 #
 if USING_PYTHON_2
 install-exec-hook:
-	sed --in-place 's|^#!/usr/bin/python3|#!/usr/bin/python2|' \
+	sed --in-place 's|^#!/usr/bin/env python3|#!/usr/bin/env python2|' \
 	    $(DESTDIR)$(bindir)/dbufstat
 endif

cmd/dbufstat/dbufstat

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 #
 # Print out statistics for all cached dmu buffers.  This information
 # is available through the dbufs kstat and may be post-processed as

cmd/fsck_zfs/fsck.zfs

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# fsck.zfs: A fsck helper to accomidate distributions that expect
+# fsck.zfs: A fsck helper to accommodate distributions that expect
 # to be able to execute a fsck on all filesystem types.  Currently
 # this script does nothing but it could be extended to act as a
 # compatibility wrapper for 'zpool scrub'.

cmd/mount_zfs/mount_zfs.c

@@ -489,7 +489,7 @@ main(int argc, char **argv)
 		zfsutil = 1;
 
 	if ((g_zfs = libzfs_init()) == NULL) {
-		(void) fprintf(stderr, "%s", libzfs_error_init(errno));
+		(void) fprintf(stderr, "%s\n", libzfs_error_init(errno));
 		return (MOUNT_SYSERR);
 	}
 

cmd/vdev_id/vdev_id

@@ -102,7 +102,7 @@ Usage: vdev_id [-h]
        vdev_id <-d device> [-c config_file] [-p phys_per_port]
                [-g sas_direct|sas_switch|scsi] [-m]
 
-  -c    specify name of alernate config file [default=$CONFIG]
+  -c    specify name of an alternative config file [default=$CONFIG]
   -d    specify basename of device (i.e. sda)
   -e    Create enclose device symlinks only (/dev/by-enclosure)
   -g    Storage network topology [default="$TOPOLOGY"]