On Thu, May 14, 2015 at 12:40:31PM +0800, Eryu Guan wrote: > On Thu, May 14, 2015 at 12:14:06PM +1000, Dave Chinner wrote: > > On Sun, May 10, 2015 at 07:50:43PM +0800, Eryu Guan wrote: > > > With the change to CRCs by default, some tests are updated to call mkfs > > > with "-m crc=0" option directly, and this breaks testings on older > > > distros where mkfs.xfs doesn't have crc support. > > > > > > Introduce a new variable to tell if mkfs.xfs supports v5 xfs and do > > > tweaks in _scratch_mkfs_xfs_opts() based on it. > > > > > > Signed-off-by: Eryu Guan <[email protected]> > > > --- > > > > > > This is based on Dave's commit "filter: inode size output of mkfs.xfs can > > > change" > > > > > > Tested on upstream kernel with upstream xfsprogs(v5 as default) and on > > > RHEL7(v4 > > > as default) and on RHEL6(no v5 support), all seem fine, no failures > > > caused by > > > crc options. > > > > > > check | 10 +++++++++- > > > common/rc | 5 +++++ > > > tests/xfs/073 | 4 +++- > > > 3 files changed, 17 insertions(+), 2 deletions(-) > > > > > > diff --git a/check b/check > > > index 4fa96ed..568c05b 100755 > > > --- a/check > > > +++ b/check > > > @@ -505,9 +505,17 @@ for section in $HOST_OPTIONS_SECTIONS; do > > > > > > if [ ! -z "$SCRATCH_DEV" ]; then > > > umount $SCRATCH_DEV 2>/dev/null > > > + > > > + # check if mkfs.xfs supports v5 xfs > > > + if [ "$FSTYP" == "xfs" ]; then > > > + export XFS_MKFS_HAS_NO_META_SUPPORT="" > > > + if ! _scratch_mkfs -m crc=0 >/dev/null 2>&1; then > > > + export XFS_MKFS_HAS_NO_META_SUPPORT=true > > > + fi > > > + fi > > > + > > > > Shouldn't this be somewhere in common/config, not in the check > > script itself? > > When sourcing common/config, SCRATCH_DEV has not been validated, and > things get messier when config sections are used.
Don't need a scratch dev: touch /tmp/foo mkfs.xfs -N -d file,name=/tmp/foo,size=32m -m crc=0 rm /tmp/foo mkfs will succeed if "-m crc=X" is recognised, fail if it isn't. the "-N" means it just does arg parsing and checks geometry, etc but does not do try to create the filesystem.... > I missed it, it's better than _scratch_mkfs, thanks! But it's not > available in common/config if we want to do the check there. *nod*. In which case you'd just use MKFS_XFS_PROG directly, like above. Cheers, Dave. -- Dave Chinner [email protected] -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
