diff --git a/tests/generic/438 b/tests/generic/438
new file mode 100755
index 00000000..e6c39248
--- /dev/null
+++ b/tests/generic/438
@@ -0,0 +1,80 @@
+#! /bin/bash
+# FS QA Test No. generic/438
+#
+# Test that if we punch a hole in a file, with either a range that goes beyond
+# the file's size or covers a file range that is already a hole, and that if
+# after we do some buffered write operations that cover different parts of the
+# hole, no warnings are emmitted in syslog/dmesg and the file's content is
+# correct after remounting the filesystem.
+#
+#-----------------------------------------------------------------------
+#
+# Copyright (C) 2017 SUSE Linux Products GmbH. All Rights Reserved.
+# Author: Filipe Manana <fdmanana@suse.com>
+#
+# 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"
+
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_test
+_require_scratch
+_require_xfs_io_command "fpunch"
+
+rm -f $seqres.full
+
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+$XFS_IO_PROG -f -c "pwrite -S 0xaa 0 100K" $SCRATCH_MNT/f | _filter_xfs_io
+$XFS_IO_PROG -c "fpunch 60K 90K" $SCRATCH_MNT/f
+$XFS_IO_PROG -c "pwrite -S 0xbb -b 100K 50K 100K" $SCRATCH_MNT/f | _filter_xfs_io
+$XFS_IO_PROG -c "pwrite -S 0xcc -b 50K 100K 50K" $SCRATCH_MNT/f | _filter_xfs_io
+
+$XFS_IO_PROG -f -c "fpunch 695K 820K" $SCRATCH_MNT/f2
+$XFS_IO_PROG -c "pwrite -S 0xaa 1008K 307K" $SCRATCH_MNT/f2 |  _filter_xfs_io
+$XFS_IO_PROG -c "pwrite -S 0xbb -b 630K 1073K 630K" $SCRATCH_MNT/f2 \
+	| _filter_xfs_io
+$XFS_IO_PROG -c "pwrite -S 0xcc -b 459K 1068K 459K" $SCRATCH_MNT/f2 \
+	| _filter_xfs_io
+
+_scratch_cycle_mount
+
+echo "File f contents after remounting filesystem:"
+od -t x1 $SCRATCH_MNT/f
+echo "File f2 contents after remounting filesystem:"
+od -t x1 $SCRATCH_MNT/f2
+
+status=0
+exit
diff --git a/tests/generic/438.out b/tests/generic/438.out
new file mode 100644
index 00000000..40067e79
--- /dev/null
+++ b/tests/generic/438.out
@@ -0,0 +1,31 @@
+QA output created by 438
+wrote 102400/102400 bytes at offset 0
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 102400/102400 bytes at offset 51200
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 51200/51200 bytes at offset 102400
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 314368/314368 bytes at offset 1032192
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 645120/645120 bytes at offset 1098752
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 470016/470016 bytes at offset 1093632
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+File f contents after remounting filesystem:
+0000000 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
+*
+0144000 bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb
+*
+0310000 cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc
+*
+0454000
+File f2 contents after remounting filesystem:
+0000000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+*
+3740000 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
+*
+4130000 cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc
+*
+5756000 bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb
+*
+6516000
diff --git a/tests/generic/group b/tests/generic/group
index 438c2990..34f176a9 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -440,3 +440,4 @@
 435 auto encrypt
 436 auto quick rw
 437 auto quick
+438 auto quick punch
