common: fix flink check
authorJosef Bacik <jbacik@fb.com>
Tue, 13 May 2014 05:30:03 +0000 (15:30 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 13 May 2014 05:30:03 +0000 (15:30 +1000)
I don't have flink support in my xfsprogs, but it doesn't fail with "command not
found" or whatever, it fails because I don't have the -T option, whereas Eric
gets an error about $TEST_DIR being a directory because his xfs_io tries to open
the directory first before it parses the options.  So fix this by checking flink
with these two cases and don't run if we hit either of them.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
common/rc

index 154cde14b9d3d471d54048b20d5caf6b3b47a2c8..d1788d1f6df537793b1c00457c92b2b35cdd5f70 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -1266,6 +1266,8 @@ _require_xfs_io_command()
        "flink" )
                testio=`$XFS_IO_PROG -T -F -c "flink $testfile" \
                        $TEST_DIR 2>&1`
+               echo $testio | egrep -q "invalid option|Is a directory" && \
+                       _notrun "xfs_io $command support is missing"
                ;;
        *)
                testio=`$XFS_IO_PROG -c "$command help" 2>&1`