On Sat, May 04, 2013 at 08:23:57AM -0500, Eric Sandeen wrote: > The -F flag to xfs_io originally enabled it to operate on non-xfs > filesystems. This restriction was removed upstream in favor of > gracefully failing on the handful of operations that actually > required xfs, and the option was deprecated. > > However, xfstests is still used on distros with older xfsprogs, and > so "xfs_io -F" was necessary throughout xfstests. > > Simplify this by appending -F to XFS_IO_PROG when it's exported, > if we're not running on an xfs filesystem. > > This will eliminate errors when new tests leave out the -F, and > if and when -F is finally removed, there will be one central location > in xfstests to update. > > Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> All looks good, but.... > --- > > diff --git a/common/config b/common/config > index 67c1498..554a2c2 100644 > --- a/common/config > +++ b/common/config > @@ -157,6 +157,8 @@ export XFS_REPAIR_PROG="`set_prog_path xfs_repair`" > export XFS_DB_PROG="`set_prog_path xfs_db`" > export XFS_GROWFS_PROG=`set_prog_path xfs_growfs` > export XFS_IO_PROG="`set_prog_path xfs_io`" > +# Older xfs_io refuses to run w/o -F on non-xfs > +[ "$FSTYP" != "xfs" ] && export XFS_IO_PROG="$XFS_IO_PROG -F" I wonder if we can be smarter about this, and not set it on versions of xfs_io that don't need it so we don't have to care about future versions of xfs_io that might remove the option completely rather than silently ignore it? For example, after we've validated the $TEST_DEV in common/rc, run an xfs_io command on the TEST_DIR and determine if the -F flag is required? We do all sorts of additional checks in common/rc after including common/config, so perhaps fixing this is better done in common/rc rather than common/config.... Other than that, the change looks good. Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
