Revert "Manually sync scripts/ with the upstream release."

This reverts commit ae1cd09777a9fb4060fabf830df4c32824951f24
to keep pkg-zfs limited to the debian/ overlay.

These symlinks were dereferenced in pkg-zfs so that the zfs-linux
source package could be diffed directly onto the vanilla upstream
tarball, but the orig tarball produced by git-buildpackage from the
upstream/* git tags is now being published to the PPA instead.

diff --git a/scripts/zpios-test/large-thread-survey.sh b/scripts/zpios-test/large-thread-survey.sh
deleted file mode 100755 (executable)
index 743e97b648f015dfafb11aad3c65494c4efee003..0000000000000000000000000000000000000000
--- a/scripts/zpios-test/large-thread-survey.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# Usage: zpios
-#        --threadcount       -t    =values
-#        --threadcount_low   -l    =value
-#        --threadcount_high  -h    =value
-#        --threadcount_incr  -e    =value
-#        --regioncount       -n    =values
-#        --regioncount_low   -i    =value
-#        --regioncount_high  -j    =value
-#        --regioncount_incr  -k    =value
-#        --offset            -o    =values
-#        --offset_low        -m    =value
-#        --offset_high       -q    =value
-#        --offset_incr       -r    =value
-#        --chunksize         -c    =values
-#        --chunksize_low     -a    =value
-#        --chunksize_high    -b    =value
-#        --chunksize_incr    -g    =value
-#        --regionsize        -s    =values
-#        --regionsize_low    -A    =value
-#        --regionsize_high   -B    =value
-#        --regionsize_incr   -C    =value
-#        --load              -L    =dmuio|ssf|fpp
-#        --pool              -p    =pool name
-#        --name              -M    =test name
-#        --cleanup           -x
-#        --prerun            -P    =pre-command
-#        --postrun           -R    =post-command
-#        --log               -G    =log directory
-#        --regionnoise       -I    =shift
-#        --chunknoise        -N    =bytes
-#        --threaddelay       -T    =jiffies
-#        --verify            -V
-#        --zerocopy          -z
-#        --nowait            -O
-#        --human-readable    -H
-#        --verbose           -v    =increase verbosity
-#        --help              -?    =this help
-
-ZPIOS_CMD="${ZPIOS}                                              \
-       --load=dmuio                                             \
-       --pool=${ZPOOL_NAME}                                     \
-       --name=${ZPOOL_CONFIG}                                   \
-       --threadcount=1,2,4,8,16,32,64,128,256                   \
-       --regioncount=65536                                      \
-       --regionsize=4M                                          \
-       --chunksize=1M                                           \
-       --offset=4M                                              \
-        --cleanup                                                \
-       --human-readable                                         \
-       ${ZPIOS_OPTIONS}"
-
-zpios_start() {
-       if [ ${VERBOSE} ]; then
-               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
-               echo ${ZPIOS_CMD}
-       fi
-
-       ${ZPIOS_CMD} || exit 1
-}
-
-zpios_stop() {
-       [ ${VERBOSE} ] && echo
-}

diff --git a/scripts/zpios-test/large-thread-survey.sh b/scripts/zpios-test/large-thread-survey.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..90b6e3c47c171773cc00b14db7d7619353e6d8ac
--- /dev/null
+++ b/scripts/zpios-test/large-thread-survey.sh
@@ -0,0 +1 @@
+1x256th-65536rc-4rs-1cs-4off.sh
\ No newline at end of file

diff --git a/scripts/zpios-test/large.sh b/scripts/zpios-test/large.sh
deleted file mode 100755 (executable)
index 92a3b77b482b864e89f89977247e4b336d2a6fe6..0000000000000000000000000000000000000000
--- a/scripts/zpios-test/large.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# Usage: zpios
-#        --threadcount       -t    =values
-#        --threadcount_low   -l    =value
-#        --threadcount_high  -h    =value
-#        --threadcount_incr  -e    =value
-#        --regioncount       -n    =values
-#        --regioncount_low   -i    =value
-#        --regioncount_high  -j    =value
-#        --regioncount_incr  -k    =value
-#        --offset            -o    =values
-#        --offset_low        -m    =value
-#        --offset_high       -q    =value
-#        --offset_incr       -r    =value
-#        --chunksize         -c    =values
-#        --chunksize_low     -a    =value
-#        --chunksize_high    -b    =value
-#        --chunksize_incr    -g    =value
-#        --regionsize        -s    =values
-#        --regionsize_low    -A    =value
-#        --regionsize_high   -B    =value
-#        --regionsize_incr   -C    =value
-#        --load              -L    =dmuio|ssf|fpp
-#        --pool              -p    =pool name
-#        --name              -M    =test name
-#        --cleanup           -x
-#        --prerun            -P    =pre-command
-#        --postrun           -R    =post-command
-#        --log               -G    =log directory
-#        --regionnoise       -I    =shift
-#        --chunknoise        -N    =bytes
-#        --threaddelay       -T    =jiffies
-#        --verify            -V
-#        --zerocopy          -z
-#        --nowait            -O
-#        --human-readable    -H
-#        --verbose           -v    =increase verbosity
-#        --help              -?    =this help
-
-ZPIOS_CMD="${ZPIOS}                                              \
-       --load=dmuio                                             \
-       --pool=${ZPOOL_NAME}                                     \
-       --name=${ZPOOL_CONFIG}                                   \
-       --threadcount=256                                        \
-       --regioncount=65536                                      \
-       --regionsize=4M                                          \
-       --chunksize=1M                                           \
-       --offset=4M                                              \
-        --cleanup                                                \
-       --human-readable                                         \
-       ${ZPIOS_OPTIONS}"
-
-zpios_start() {
-       if [ ${VERBOSE} ]; then
-               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
-               echo ${ZPIOS_CMD}
-       fi
-
-       ${ZPIOS_CMD} || exit 1
-}
-
-zpios_stop() {
-       [ ${VERBOSE} ] && echo
-}

diff --git a/scripts/zpios-test/large.sh b/scripts/zpios-test/large.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..b8e22bf54b600ad0cb1eda352c5ca895a45f7927
--- /dev/null
+++ b/scripts/zpios-test/large.sh
@@ -0,0 +1 @@
+256th-65536rc-4rs-1cs-4off.sh
\ No newline at end of file

diff --git a/scripts/zpios-test/medium.sh b/scripts/zpios-test/medium.sh
deleted file mode 100755 (executable)
index cbd9c697adc0f7fe062541f9c507c095706dcd0b..0000000000000000000000000000000000000000
--- a/scripts/zpios-test/medium.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# Usage: zpios
-#        --threadcount       -t    =values
-#        --threadcount_low   -l    =value
-#        --threadcount_high  -h    =value
-#        --threadcount_incr  -e    =value
-#        --regioncount       -n    =values
-#        --regioncount_low   -i    =value
-#        --regioncount_high  -j    =value
-#        --regioncount_incr  -k    =value
-#        --offset            -o    =values
-#        --offset_low        -m    =value
-#        --offset_high       -q    =value
-#        --offset_incr       -r    =value
-#        --chunksize         -c    =values
-#        --chunksize_low     -a    =value
-#        --chunksize_high    -b    =value
-#        --chunksize_incr    -g    =value
-#        --regionsize        -s    =values
-#        --regionsize_low    -A    =value
-#        --regionsize_high   -B    =value
-#        --regionsize_incr   -C    =value
-#        --load              -L    =dmuio|ssf|fpp
-#        --pool              -p    =pool name
-#        --name              -M    =test name
-#        --cleanup           -x
-#        --prerun            -P    =pre-command
-#        --postrun           -R    =post-command
-#        --log               -G    =log directory
-#        --regionnoise       -I    =shift
-#        --chunknoise        -N    =bytes
-#        --threaddelay       -T    =jiffies
-#        --verify            -V
-#        --zerocopy          -z
-#        --nowait            -O
-#        --human-readable    -H
-#        --verbose           -v    =increase verbosity
-#        --help              -?    =this help
-
-ZPIOS_CMD="${ZPIOS}                                              \
-       --load=dmuio                                             \
-       --pool=${ZPOOL_NAME}                                     \
-       --name=${ZPOOL_CONFIG}                                   \
-       --threadcount=16                                         \
-       --regioncount=8192                                       \
-       --regionsize=4M                                          \
-       --chunksize=1M                                           \
-       --offset=4M                                              \
-       --cleanup                                                \
-       --human-readable                                         \
-       ${ZPIOS_OPTIONS}"
-
-zpios_start() {
-       if [ ${VERBOSE} ]; then
-               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
-               echo ${ZPIOS_CMD}
-       fi
-
-       ${ZPIOS_CMD} || exit 1
-}
-
-zpios_stop() {
-       [ ${VERBOSE} ] && echo
-}

diff --git a/scripts/zpios-test/medium.sh b/scripts/zpios-test/medium.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..d81027b7395be25fa229b2f8197c0803305492db
--- /dev/null
+++ b/scripts/zpios-test/medium.sh
@@ -0,0 +1 @@
+16th-8192rc-4rs-1cs-4off.sh
\ No newline at end of file

diff --git a/scripts/zpios-test/small.sh b/scripts/zpios-test/small.sh
deleted file mode 100755 (executable)
index 0db952cd65d2205c4016a50685cff97735d97a51..0000000000000000000000000000000000000000
--- a/scripts/zpios-test/small.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# Usage: zpios
-#        --threadcount       -t    =values
-#        --threadcount_low   -l    =value
-#        --threadcount_high  -h    =value
-#        --threadcount_incr  -e    =value
-#        --regioncount       -n    =values
-#        --regioncount_low   -i    =value
-#        --regioncount_high  -j    =value
-#        --regioncount_incr  -k    =value
-#        --offset            -o    =values
-#        --offset_low        -m    =value
-#        --offset_high       -q    =value
-#        --offset_incr       -r    =value
-#        --chunksize         -c    =values
-#        --chunksize_low     -a    =value
-#        --chunksize_high    -b    =value
-#        --chunksize_incr    -g    =value
-#        --regionsize        -s    =values
-#        --regionsize_low    -A    =value
-#        --regionsize_high   -B    =value
-#        --regionsize_incr   -C    =value
-#        --load              -L    =dmuio|ssf|fpp
-#        --pool              -p    =pool name
-#        --name              -M    =test name
-#        --cleanup           -x
-#        --prerun            -P    =pre-command
-#        --postrun           -R    =post-command
-#        --log               -G    =log directory
-#        --regionnoise       -I    =shift
-#        --chunknoise        -N    =bytes
-#        --threaddelay       -T    =jiffies
-#        --verify            -V
-#        --zerocopy          -z
-#        --nowait            -O
-#        --human-readable    -H
-#        --verbose           -v    =increase verbosity
-#        --help              -?    =this help
-
-ZPIOS_CMD="${ZPIOS}                                              \
-       --load=dmuio                                             \
-       --pool=${ZPOOL_NAME}                                     \
-       --name=${ZPOOL_CONFIG}                                   \
-       --threadcount=4                                          \
-       --regioncount=1024                                       \
-       --regionsize=4M                                          \
-       --chunksize=1M                                           \
-       --offset=4M                                              \
-       --cleanup                                                \
-       --human-readable                                         \
-       ${ZPIOS_OPTIONS}"
-
-zpios_start() {
-       if [ ${VERBOSE} ]; then
-               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
-               echo ${ZPIOS_CMD}
-       fi
-
-       ${ZPIOS_CMD} || exit 1
-}
-
-zpios_stop() {
-       [ ${VERBOSE} ] && echo
-}

diff --git a/scripts/zpios-test/small.sh b/scripts/zpios-test/small.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..cbf03b5ceeb963406ed942a7f24cafe64f795826
--- /dev/null
+++ b/scripts/zpios-test/small.sh
@@ -0,0 +1 @@
+4th-1024rc-4rs-1cs-4off.sh
\ No newline at end of file

diff --git a/scripts/zpios-test/tiny.sh b/scripts/zpios-test/tiny.sh
deleted file mode 100755 (executable)
index cd3c50b7737bba12020858a7b37cf5fec30cca73..0000000000000000000000000000000000000000
--- a/scripts/zpios-test/tiny.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-#
-# Usage: zpios
-#        --threadcount       -t    =values
-#        --threadcount_low   -l    =value
-#        --threadcount_high  -h    =value
-#        --threadcount_incr  -e    =value
-#        --regioncount       -n    =values
-#        --regioncount_low   -i    =value
-#        --regioncount_high  -j    =value
-#        --regioncount_incr  -k    =value
-#        --offset            -o    =values
-#        --offset_low        -m    =value
-#        --offset_high       -q    =value
-#        --offset_incr       -r    =value
-#        --chunksize         -c    =values
-#        --chunksize_low     -a    =value
-#        --chunksize_high    -b    =value
-#        --chunksize_incr    -g    =value
-#        --regionsize        -s    =values
-#        --regionsize_low    -A    =value
-#        --regionsize_high   -B    =value
-#        --regionsize_incr   -C    =value
-#        --load              -L    =dmuio|ssf|fpp
-#        --pool              -p    =pool name
-#        --name              -M    =test name
-#        --cleanup           -x
-#        --prerun            -P    =pre-command
-#        --postrun           -R    =post-command
-#        --log               -G    =log directory
-#        --regionnoise       -I    =shift
-#        --chunknoise        -N    =bytes
-#        --threaddelay       -T    =jiffies
-#        --verify            -V
-#        --zerocopy          -z
-#        --nowait            -O
-#        --human-readable    -H
-#        --verbose           -v    =increase verbosity
-#        --help              -?    =this help
-
-
-ZPIOS_CMD="${ZPIOS}                                              \
-       --load=dmuio                                             \
-       --pool=${ZPOOL_NAME}                                     \
-       --name=${ZPOOL_CONFIG}                                   \
-       --threadcount=1                                          \
-       --regioncount=16                                         \
-       --regionsize=4M                                          \
-       --chunksize=1M                                           \
-       --offset=4M                                              \
-       --cleanup                                                \
-       --human-readable                                         \
-       ${ZPIOS_OPTIONS}"
-
-zpios_start() {
-       if [ ${VERBOSE} ]; then
-               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
-               echo ${ZPIOS_CMD}
-       fi
-
-       ${ZPIOS_CMD} || exit 1
-}
-
-zpios_stop() {
-       [ ${VERBOSE} ] && echo
-}

diff --git a/scripts/zpios-test/tiny.sh b/scripts/zpios-test/tiny.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ba8b7cd0c14dda42ccf75168e1135edb0a293915
--- /dev/null
+++ b/scripts/zpios-test/tiny.sh
@@ -0,0 +1 @@
+1th-16rc-4rs-1cs-4off.sh
\ No newline at end of file