xfstests generic/306 fixes and updates

older xfs_io refused to write to /dev/null because it's
not a file on an xfs filesystem.  So add -F.

While we're at it, add more testcases:

* symlink on a RO fs pointing to a file on a RW fs.
* bind-mounted rw file on an RO fs.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/tests/generic/306 b/tests/generic/306
index 35fb5ef9b823bdfd0a9fd5abe416602768c5305d..e8e0fc0a0a9ffada0295dd9138f368d7001c3de8 100644 (file)
--- a/tests/generic/306
+++ b/tests/generic/306
@@ -32,6 +32,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
+    umount $BINDFILE
     cd /
     rm -f $tmp.*
 }
@@ -49,6 +50,9 @@ _require_scratch
 
 DEVNULL=$SCRATCH_MNT/devnull
 DEVZERO=$SCRATCH_MNT/devzero
+SYMLINK=$SCRATCH_MNT/symlink
+BINDFILE=$SCRATCH_MNT/bindfile
+TARGET=$TEST_DIR/target
 
 rm -f $seqres.full
 _scratch_mkfs > $seqres.full 2>&1
@@ -58,23 +62,39 @@ rm -f $DEVNULL $DEVZERO
 
 mknod $DEVNULL c 1 3 || _fail "Could not create devnull device"
 mknod $DEVZERO c 1 5 || _fail "Could not create devzero device"
+touch $BINDFILE || _fail "Could not create bind mount file"
+touch $TARGET || _fail "Could not create symlink target"
+ln -s $TARGET $SYMLINK
 
 _scratch_unmount || _fail "Could not unmount scratch device"
-_scratch_mount -o ro || _fail "Could notemount scratch readonly"
+_scratch_mount -o ro || _fail "Could not mount scratch readonly"
 
 # We should be able to read & write to/from these devices even on an RO fs
 echo "== try to create new file"
 touch $SCRATCH_MNT/this_should_fail 2>&1 | _filter_scratch
 echo "== pwrite to null device"
-$XFS_IO_PROG -c "pwrite 0 512" /dev/null | _filter_xfs_io
+$XFS_IO_PROG -F -c "pwrite 0 512" /dev/null | _filter_xfs_io
 echo "== pread from zero device"
-$XFS_IO_PROG -c "pread 0 512" /dev/zero | _filter_xfs_io
+$XFS_IO_PROG -F -c "pread 0 512" /dev/zero | _filter_xfs_io
 
 echo "== truncating write to null device"
 echo foo > $DEVNULL 2>&1 | _filter_scratch
 echo "== appending write to null device"
 echo foo >> $DEVNULL 2>&1 | _filter_scratch
 
+echo "== writing to symlink from ro fs to rw fs"
+# Various combinations of O_CREAT & O_TRUNC
+$XFS_IO_PROG -F -c "pwrite 0 512" $SYMLINK | _filter_xfs_io
+$XFS_IO_PROG -F -f -c "pwrite 0 512" $SYMLINK | _filter_xfs_io
+$XFS_IO_PROG -F -t -c "pwrite 0 512" $SYMLINK | _filter_xfs_io
+
+echo "== write to bind-mounted rw file on ro fs"
+mount --bind $TARGET $BINDFILE
+# with and without -f (adds O_CREAT)
+$XFS_IO_PROG -F -c "pwrite 0 512" $BINDFILE | _filter_xfs_io
+$XFS_IO_PROG -F -f -c "pwrite 0 512" $BINDFILE | _filter_xfs_io
+$XFS_IO_PROG -F -t -c "pwrite 0 512" $BINDFILE | _filter_xfs_io
+
 # success, all done
 status=0
 exit

diff --git a/tests/generic/306.out b/tests/generic/306.out
index 8644f383683ad3e58b97e79f5be7e138dc25895d..69bfb42e73817b1b0511cb508c054ec96a10170b 100644 (file)
--- a/tests/generic/306.out
+++ b/tests/generic/306.out
@@ -9,3 +9,17 @@ read 512/512 bytes at offset 0
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 == truncating write to null device
 == appending write to null device
+== writing to symlink from ro fs to rw fs
+wrote 512/512 bytes at offset 0
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 512/512 bytes at offset 0
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 512/512 bytes at offset 0
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+== write to bind-mounted rw file on ro fs
+wrote 512/512 bytes at offset 0
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 512/512 bytes at offset 0
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 512/512 bytes at offset 0
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)