generic: renumber tests after merge

Some tests were merged with high, non-conflicting test numbers
(700+). Renumber them down to contiguous numbers now that all the
other tests have been added, as it's easier to do it this way rather
than having to rebase and have to fix all the conflicts early
renumbering will cause.

Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/generic/349 b/tests/generic/349
new file mode 100755 (executable)
index 0000000..ae9f8f6
--- /dev/null
+++ b/tests/generic/349
@@ -0,0 +1,89 @@
+#! /bin/bash
+# FS QA Test No. 349
+#
+# Test fallocate(ZERO_RANGE) on a block device, which should be able to
+# WRITE SAME (or equivalent) the range.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2016 Oracle, Inc.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1       # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 7 15
+
+_cleanup()
+{
+    cd /
+    rm -rf $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/scsi_debug
+
+# real QA test starts here
+_supported_os Linux
+_require_scsi_debug
+_require_xfs_io_command "fzero"
+
+echo "Create and format"
+dev=$(_get_scsi_debug_dev 512 512 0 4 "lbpws=1 lbpws10=1")
+_pwrite_byte 0x62 0 4m $dev >> $seqres.full
+
+echo "Zero range"
+$XFS_IO_PROG -c "fzero -k 512k 1m" $dev
+
+echo "Zero range without keep_size"
+$XFS_IO_PROG -c "fzero 384k 64k" $dev
+
+echo "Zero range past EOD"
+$XFS_IO_PROG -c "fzero -k 3m 4m" $dev
+
+echo "Check contents"
+md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
+
+echo "Zero range to MAX_LFS_FILESIZE"
+# zod = MAX_LFS_FILESIZE
+case "$(getconf LONG_BIT)" in
+"32")
+       zod=$(( ($(getconf PAGE_SIZE) << ($(getconf LONG_BIT) - 1) ) - 1))
+       ;;
+"64")
+       zod=9223372036854775807
+       ;;
+*)
+       _fail "sizeof(long) == $(getconf LONG_BIT)?"
+       ;;
+esac
+$XFS_IO_PROG -c "fzero -k 0 $zod" $dev
+
+echo "Check contents"
+md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
+
+echo "Destroy device"
+_put_scsi_debug_dev
+
+# success, all done
+status=0
+exit

diff --git a/tests/generic/349.out b/tests/generic/349.out
new file mode 100644 (file)
index 0000000..ddddbfc
--- /dev/null
+++ b/tests/generic/349.out
@@ -0,0 +1,11 @@
+QA output created by 349
+Create and format
+Zero range
+Zero range without keep_size
+Zero range past EOD
+Check contents
+f0cb9070c098aa347f664bead3a219d9  SCSI_DEBUG_DEV
+Zero range to MAX_LFS_FILESIZE
+Check contents
+b5cfa9d6c8febd618f91ac2843d50a1c  SCSI_DEBUG_DEV
+Destroy device

diff --git a/tests/generic/350 b/tests/generic/350
new file mode 100755 (executable)
index 0000000..0a12e14
--- /dev/null
+++ b/tests/generic/350
@@ -0,0 +1,86 @@
+#! /bin/bash
+# FS QA Test No. 350
+#
+# Test fallocate(PUNCH_HOLE) on a block device, which should be able to
+# zero-TRIM (or equivalent) the range.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2016 Oracle, Inc.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1       # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 7 15
+
+_cleanup()
+{
+    cd /
+    rm -rf $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/scsi_debug
+
+# real QA test starts here
+_supported_os Linux
+_require_scsi_debug
+_require_xfs_io_command "fpunch"
+
+echo "Create and format"
+dev=$(_get_scsi_debug_dev 512 512 0 4 "lbpws=1 lbpws10=1")
+_pwrite_byte 0x62 0 4m $dev >> $seqres.full
+
+echo "Zero punch"
+$XFS_IO_PROG -c "fpunch 512k 1m" $dev
+
+echo "Punch range past EOD"
+$XFS_IO_PROG -c "fpunch 3m 4m" $dev
+
+echo "Check contents"
+md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
+
+echo "Punch to MAX_LFS_FILESIZE"
+# zod = MAX_LFS_FILESIZE
+case "$(getconf LONG_BIT)" in
+"32")
+       zod=$(( ($(getconf PAGE_SIZE) << ($(getconf LONG_BIT) - 1) ) - 1))
+       ;;
+"64")
+       zod=9223372036854775807
+       ;;
+*)
+       _fail "sizeof(long) == $(getconf LONG_BIT)?"
+       ;;
+esac
+$XFS_IO_PROG -c "fpunch 0 $zod" $dev
+
+echo "Check contents"
+md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
+
+echo "Destroy device"
+_put_scsi_debug_dev
+
+# success, all done
+status=0
+exit

diff --git a/tests/generic/350.out b/tests/generic/350.out
new file mode 100644 (file)
index 0000000..6466c18
--- /dev/null
+++ b/tests/generic/350.out
@@ -0,0 +1,10 @@
+QA output created by 350
+Create and format
+Zero punch
+Punch range past EOD
+Check contents
+8c6a3fd51601141b56eaebbab3746156  SCSI_DEBUG_DEV
+Punch to MAX_LFS_FILESIZE
+Check contents
+b5cfa9d6c8febd618f91ac2843d50a1c  SCSI_DEBUG_DEV
+Destroy device

diff --git a/tests/generic/351 b/tests/generic/351
new file mode 100755 (executable)
index 0000000..e87fc18
--- /dev/null
+++ b/tests/generic/351
@@ -0,0 +1,130 @@
+#! /bin/bash
+# FS QA Test No. 351
+#
+# Test the unsupported fallocate flags on a block device.  No collapse
+# or insert range, no regular fallocate, no forgetting keep-space on
+# zero range, no punching past EOD, no requests that aren't aligned
+# with the logicalsector size, and make sure the fallbacks work for
+# devices that don't support write_same or discard.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2016 Oracle, Inc.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1       # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 7 15
+
+_cleanup()
+{
+    cd /
+    rm -rf $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/scsi_debug
+
+# real QA test starts here
+_supported_os Linux
+_require_scsi_debug
+_require_xfs_io_command "falloc"
+_require_xfs_io_command "finsert"
+_require_xfs_io_command "fcollapse"
+_require_xfs_io_command "fzero"
+_require_xfs_io_command "fpunch"
+
+
+echo "Create and format"
+dev=$(_get_scsi_debug_dev 4096 4096 0 4 "lbpws=1 lbpws10=1")
+_pwrite_byte 0x62 0 4m $dev >> $seqres.full
+$XFS_IO_PROG -c "fsync" $dev
+
+echo "Regular fallocate"
+$XFS_IO_PROG -c "falloc 64k 64k" $dev
+
+echo "Insert range"
+$XFS_IO_PROG -c "finsert 128k 64k" $dev
+
+echo "Collapse range"
+$XFS_IO_PROG -c "fcollapse 256k 64k" $dev
+
+echo "Unaligned zero range"
+$XFS_IO_PROG -c "fzero -k 512 512" $dev
+
+echo "Unaligned punch"
+$XFS_IO_PROG -c "fpunch 512 512" $dev
+
+echo "Zero range past MAX_LFS_FILESIZE keep size"
+# zod = MAX_LFS_FILESIZE
+case "$(getconf LONG_BIT)" in
+"32")
+       zod=$(( ($(getconf PAGE_SIZE) << ($(getconf LONG_BIT) - 1) ) - 1))
+       ;;
+"64")
+       zod=9223372036854775807
+       ;;
+*)
+       _fail "sizeof(long) == $(getconf LONG_BIT)?"
+       ;;
+esac
+$XFS_IO_PROG -c "fzero -k 512k $zod" $dev
+
+echo "Zero range past MAX_LFS_FILESIZE"
+$XFS_IO_PROG -c "fzero 512k $zod" $dev
+
+echo "Zero range to MAX_LFS_FILESIZE fail w/o keepsize"
+$XFS_IO_PROG -c "fzero 0 $zod" $dev
+
+echo "Zero range starts past EOD"
+$XFS_IO_PROG -c "fzero -k 900m 1m" $dev
+
+echo "Punch starts past EOD"
+$XFS_IO_PROG -c "fpunch 900m 1m" $dev
+
+echo "Check contents"
+md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
+
+echo "Destroy device"
+_put_scsi_debug_dev
+
+echo "Create w/o unmap or writesame and format"
+dev=$(_get_scsi_debug_dev 512 512 0 4 "lbpws=0 lbpws10=0 lbpu=0 write_same_length=0 unmap_max_blocks=0")
+_pwrite_byte 0x62 0 4m $dev >> $seqres.full
+$XFS_IO_PROG -c "fsync" $dev
+
+echo "Zero punch, no fallback available"
+$XFS_IO_PROG -c "fpunch 512k 512k" $dev
+
+echo "Zero range, write fallback"
+$XFS_IO_PROG -c "fzero -k 1536k 512k" $dev
+
+echo "Check contents"
+md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
+
+echo "Destroy device"
+_put_scsi_debug_dev
+
+# success, all done
+status=0
+exit

diff --git a/tests/generic/351.out b/tests/generic/351.out
new file mode 100644 (file)
index 0000000..53dcc0e
--- /dev/null
+++ b/tests/generic/351.out
@@ -0,0 +1,32 @@
+QA output created by 351
+Create and format
+Regular fallocate
+fallocate: Operation not supported
+Insert range
+fallocate: Operation not supported
+Collapse range
+fallocate: Operation not supported
+Unaligned zero range
+fallocate: Invalid argument
+Unaligned punch
+fallocate: Invalid argument
+Zero range past MAX_LFS_FILESIZE keep size
+fallocate: File too large
+Zero range past MAX_LFS_FILESIZE
+fallocate: File too large
+Zero range to MAX_LFS_FILESIZE fail w/o keepsize
+fallocate: Invalid argument
+Zero range starts past EOD
+fallocate: Invalid argument
+Punch starts past EOD
+fallocate: Invalid argument
+Check contents
+b83f9394092e15bdcda585cd8e776dc6  SCSI_DEBUG_DEV
+Destroy device
+Create w/o unmap or writesame and format
+Zero punch, no fallback available
+fallocate: Operation not supported
+Zero range, write fallback
+Check contents
+0fc6bc93cd0cd97e3cde5ea39ea1185d  SCSI_DEBUG_DEV
+Destroy device

diff --git a/tests/generic/705 b/tests/generic/705
deleted file mode 100755 (executable)
index f30f2c3..0000000
--- a/tests/generic/705
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/bash
-# FS QA Test No. 705
-#
-# Test fallocate(ZERO_RANGE) on a block device, which should be able to
-# WRITE SAME (or equivalent) the range.
-#
-#-----------------------------------------------------------------------
-# Copyright (c) 2016 Oracle, Inc.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#-----------------------------------------------------------------------
-#
-
-seq=`basename $0`
-seqres=$RESULT_DIR/$seq
-echo "QA output created by $seq"
-
-here=`pwd`
-tmp=/tmp/$$
-status=1       # failure is the default!
-trap "_cleanup; exit \$status" 0 1 2 3 7 15
-
-_cleanup()
-{
-    cd /
-    rm -rf $tmp.*
-}
-
-# get standard environment, filters and checks
-. ./common/rc
-. ./common/filter
-. ./common/scsi_debug
-
-# real QA test starts here
-_supported_os Linux
-_require_scsi_debug
-_require_xfs_io_command "fzero"
-
-echo "Create and format"
-dev=$(_get_scsi_debug_dev 512 512 0 4 "lbpws=1 lbpws10=1")
-_pwrite_byte 0x62 0 4m $dev >> $seqres.full
-
-echo "Zero range"
-$XFS_IO_PROG -c "fzero -k 512k 1m" $dev
-
-echo "Zero range without keep_size"
-$XFS_IO_PROG -c "fzero 384k 64k" $dev
-
-echo "Zero range past EOD"
-$XFS_IO_PROG -c "fzero -k 3m 4m" $dev
-
-echo "Check contents"
-md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
-
-echo "Zero range to MAX_LFS_FILESIZE"
-# zod = MAX_LFS_FILESIZE
-case "$(getconf LONG_BIT)" in
-"32")
-       zod=$(( ($(getconf PAGE_SIZE) << ($(getconf LONG_BIT) - 1) ) - 1))
-       ;;
-"64")
-       zod=9223372036854775807
-       ;;
-*)
-       _fail "sizeof(long) == $(getconf LONG_BIT)?"
-       ;;
-esac
-$XFS_IO_PROG -c "fzero -k 0 $zod" $dev
-
-echo "Check contents"
-md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
-
-echo "Destroy device"
-_put_scsi_debug_dev
-
-# success, all done
-status=0
-exit

diff --git a/tests/generic/705.out b/tests/generic/705.out
deleted file mode 100644 (file)
index 86d0317..0000000
--- a/tests/generic/705.out
+++ /dev/null
@@ -1,11 +0,0 @@
-QA output created by 705
-Create and format
-Zero range
-Zero range without keep_size
-Zero range past EOD
-Check contents
-f0cb9070c098aa347f664bead3a219d9  SCSI_DEBUG_DEV
-Zero range to MAX_LFS_FILESIZE
-Check contents
-b5cfa9d6c8febd618f91ac2843d50a1c  SCSI_DEBUG_DEV
-Destroy device

diff --git a/tests/generic/706 b/tests/generic/706
deleted file mode 100755 (executable)
index dd502e2..0000000
--- a/tests/generic/706
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/bash
-# FS QA Test No. 706
-#
-# Test fallocate(PUNCH_HOLE) on a block device, which should be able to
-# zero-TRIM (or equivalent) the range.
-#
-#-----------------------------------------------------------------------
-# Copyright (c) 2016 Oracle, Inc.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#-----------------------------------------------------------------------
-#
-
-seq=`basename $0`
-seqres=$RESULT_DIR/$seq
-echo "QA output created by $seq"
-
-here=`pwd`
-tmp=/tmp/$$
-status=1       # failure is the default!
-trap "_cleanup; exit \$status" 0 1 2 3 7 15
-
-_cleanup()
-{
-    cd /
-    rm -rf $tmp.*
-}
-
-# get standard environment, filters and checks
-. ./common/rc
-. ./common/filter
-. ./common/scsi_debug
-
-# real QA test starts here
-_supported_os Linux
-_require_scsi_debug
-_require_xfs_io_command "fpunch"
-
-echo "Create and format"
-dev=$(_get_scsi_debug_dev 512 512 0 4 "lbpws=1 lbpws10=1")
-_pwrite_byte 0x62 0 4m $dev >> $seqres.full
-
-echo "Zero punch"
-$XFS_IO_PROG -c "fpunch 512k 1m" $dev
-
-echo "Punch range past EOD"
-$XFS_IO_PROG -c "fpunch 3m 4m" $dev
-
-echo "Check contents"
-md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
-
-echo "Punch to MAX_LFS_FILESIZE"
-# zod = MAX_LFS_FILESIZE
-case "$(getconf LONG_BIT)" in
-"32")
-       zod=$(( ($(getconf PAGE_SIZE) << ($(getconf LONG_BIT) - 1) ) - 1))
-       ;;
-"64")
-       zod=9223372036854775807
-       ;;
-*)
-       _fail "sizeof(long) == $(getconf LONG_BIT)?"
-       ;;
-esac
-$XFS_IO_PROG -c "fpunch 0 $zod" $dev
-
-echo "Check contents"
-md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
-
-echo "Destroy device"
-_put_scsi_debug_dev
-
-# success, all done
-status=0
-exit

diff --git a/tests/generic/706.out b/tests/generic/706.out
deleted file mode 100644 (file)
index de8de0c..0000000
--- a/tests/generic/706.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 706
-Create and format
-Zero punch
-Punch range past EOD
-Check contents
-8c6a3fd51601141b56eaebbab3746156  SCSI_DEBUG_DEV
-Punch to MAX_LFS_FILESIZE
-Check contents
-b5cfa9d6c8febd618f91ac2843d50a1c  SCSI_DEBUG_DEV
-Destroy device

diff --git a/tests/generic/707 b/tests/generic/707
deleted file mode 100755 (executable)
index 229b152..0000000
--- a/tests/generic/707
+++ /dev/null
@@ -1,130 +0,0 @@
-#! /bin/bash
-# FS QA Test No. 707
-#
-# Test the unsupported fallocate flags on a block device.  No collapse
-# or insert range, no regular fallocate, no forgetting keep-space on
-# zero range, no punching past EOD, no requests that aren't aligned
-# with the logicalsector size, and make sure the fallbacks work for
-# devices that don't support write_same or discard.
-#
-#-----------------------------------------------------------------------
-# Copyright (c) 2016 Oracle, Inc.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#-----------------------------------------------------------------------
-#
-
-seq=`basename $0`
-seqres=$RESULT_DIR/$seq
-echo "QA output created by $seq"
-
-here=`pwd`
-tmp=/tmp/$$
-status=1       # failure is the default!
-trap "_cleanup; exit \$status" 0 1 2 3 7 15
-
-_cleanup()
-{
-    cd /
-    rm -rf $tmp.*
-}
-
-# get standard environment, filters and checks
-. ./common/rc
-. ./common/filter
-. ./common/scsi_debug
-
-# real QA test starts here
-_supported_os Linux
-_require_scsi_debug
-_require_xfs_io_command "falloc"
-_require_xfs_io_command "finsert"
-_require_xfs_io_command "fcollapse"
-_require_xfs_io_command "fzero"
-_require_xfs_io_command "fpunch"
-
-
-echo "Create and format"
-dev=$(_get_scsi_debug_dev 4096 4096 0 4 "lbpws=1 lbpws10=1")
-_pwrite_byte 0x62 0 4m $dev >> $seqres.full
-$XFS_IO_PROG -c "fsync" $dev
-
-echo "Regular fallocate"
-$XFS_IO_PROG -c "falloc 64k 64k" $dev
-
-echo "Insert range"
-$XFS_IO_PROG -c "finsert 128k 64k" $dev
-
-echo "Collapse range"
-$XFS_IO_PROG -c "fcollapse 256k 64k" $dev
-
-echo "Unaligned zero range"
-$XFS_IO_PROG -c "fzero -k 512 512" $dev
-
-echo "Unaligned punch"
-$XFS_IO_PROG -c "fpunch 512 512" $dev
-
-echo "Zero range past MAX_LFS_FILESIZE keep size"
-# zod = MAX_LFS_FILESIZE
-case "$(getconf LONG_BIT)" in
-"32")
-       zod=$(( ($(getconf PAGE_SIZE) << ($(getconf LONG_BIT) - 1) ) - 1))
-       ;;
-"64")
-       zod=9223372036854775807
-       ;;
-*)
-       _fail "sizeof(long) == $(getconf LONG_BIT)?"
-       ;;
-esac
-$XFS_IO_PROG -c "fzero -k 512k $zod" $dev
-
-echo "Zero range past MAX_LFS_FILESIZE"
-$XFS_IO_PROG -c "fzero 512k $zod" $dev
-
-echo "Zero range to MAX_LFS_FILESIZE fail w/o keepsize"
-$XFS_IO_PROG -c "fzero 0 $zod" $dev
-
-echo "Zero range starts past EOD"
-$XFS_IO_PROG -c "fzero -k 900m 1m" $dev
-
-echo "Punch starts past EOD"
-$XFS_IO_PROG -c "fpunch 900m 1m" $dev
-
-echo "Check contents"
-md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
-
-echo "Destroy device"
-_put_scsi_debug_dev
-
-echo "Create w/o unmap or writesame and format"
-dev=$(_get_scsi_debug_dev 512 512 0 4 "lbpws=0 lbpws10=0 lbpu=0 write_same_length=0 unmap_max_blocks=0")
-_pwrite_byte 0x62 0 4m $dev >> $seqres.full
-$XFS_IO_PROG -c "fsync" $dev
-
-echo "Zero punch, no fallback available"
-$XFS_IO_PROG -c "fpunch 512k 512k" $dev
-
-echo "Zero range, write fallback"
-$XFS_IO_PROG -c "fzero -k 1536k 512k" $dev
-
-echo "Check contents"
-md5sum $dev | sed -e "s|$dev|SCSI_DEBUG_DEV|g"
-
-echo "Destroy device"
-_put_scsi_debug_dev
-
-# success, all done
-status=0
-exit

diff --git a/tests/generic/707.out b/tests/generic/707.out
deleted file mode 100644 (file)
index a520221..0000000
--- a/tests/generic/707.out
+++ /dev/null
@@ -1,32 +0,0 @@
-QA output created by 707
-Create and format
-Regular fallocate
-fallocate: Operation not supported
-Insert range
-fallocate: Operation not supported
-Collapse range
-fallocate: Operation not supported
-Unaligned zero range
-fallocate: Invalid argument
-Unaligned punch
-fallocate: Invalid argument
-Zero range past MAX_LFS_FILESIZE keep size
-fallocate: File too large
-Zero range past MAX_LFS_FILESIZE
-fallocate: File too large
-Zero range to MAX_LFS_FILESIZE fail w/o keepsize
-fallocate: Invalid argument
-Zero range starts past EOD
-fallocate: Invalid argument
-Punch starts past EOD
-fallocate: Invalid argument
-Check contents
-b83f9394092e15bdcda585cd8e776dc6  SCSI_DEBUG_DEV
-Destroy device
-Create w/o unmap or writesame and format
-Zero punch, no fallback available
-fallocate: Operation not supported
-Zero range, write fallback
-Check contents
-0fc6bc93cd0cd97e3cde5ea39ea1185d  SCSI_DEBUG_DEV
-Destroy device

diff --git a/tests/generic/group b/tests/generic/group
index 546b5042c4a6766c4a7dcbc5dbff824b0b1d95c5..36fb75933a13fc72d005cb61127134c1f9097f11 100644 (file)
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -351,6 +351,6 @@
 346 auto
 347 auto quick rw thin
 348 auto quick metadata
-705 blockdev quick rw
-706 blockdev quick rw
-707 blockdev quick rw
+349 blockdev quick rw
+350 blockdev quick rw
+351 blockdev quick rw