On Wed, Aug 04, 2021 at 12:19:41AM -0400, Theodore Ts'o wrote: > Signed-off-by: Theodore Ts'o <tytso@xxxxxxx> > --- > > Here are some patches which add support for testing the fuse ntfs > implementation (shipped in the ntfs-3g package) as well as Paragon > Software's proposed ntfs3 kernel submission. > > Context: https://lore.kernel.org/r/YQnHxIU+EAAxIjZA@xxxxxxx > Sample test run: https://www.kernel.org/pub/linux/kernel/people/tytso/fstests-results/results-ntfs3-2021-08-03.tar.xz > > common/config | 1 + > common/rc | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- > 2 files changed, 49 insertions(+), 3 deletions(-) > > diff --git a/common/config b/common/config > index 005fd50a..80510df2 100644 > --- a/common/config > +++ b/common/config > @@ -271,6 +271,7 @@ export MKFS_REISER4_PROG=$(type -P mkfs.reiser4) > export E2FSCK_PROG=$(type -P e2fsck) > export TUNE2FS_PROG=$(type -P tune2fs) > export FSCK_OVERLAY_PROG=$(type -P fsck.overlay) > +export MKFS_NTFS_PROG=$(type -P mkfs.ntfs) > > # SELinux adds extra xattrs which can mess up our expected output. > # So, mount with a context, and they won't be created. > diff --git a/common/rc b/common/rc > index 0fabea45..12e94b1c 100644 > --- a/common/rc > +++ b/common/rc > @@ -140,6 +140,10 @@ case "$FSTYP" in > ;; > pvfs2) > ;; > + ntfs) > + ;; > + ntfs3) > + ;; Why not "ntfs|ntfs3)" as below? > ubifs) > [ "$UBIUPDATEVOL_PROG" = "" ] && _fatal "ubiupdatevol not found" > ;; > @@ -690,6 +694,9 @@ _test_mkfs() > ext2|ext3|ext4) > $MKFS_PROG -t $FSTYP -- -F $MKFS_OPTIONS $* $TEST_DEV > ;; > + ntfs|ntfs3) > + $MKFS_NTFS_PROG $MKFS_OPTIONS $* $TEST_DEV > /dev/null > + ;; > *) > yes | $MKFS_PROG -t $FSTYP -- $MKFS_OPTIONS $* $TEST_DEV > ;; > @@ -729,6 +736,9 @@ _mkfs_dev() > $MKFS_PROG -t $FSTYP -- -f $MKFS_OPTIONS $* \ > 2>$tmp.mkfserr 1>$tmp.mkfsstd > ;; > + ntfs|ntfs3) > + $MKFS_NTFS_PROG $MKFS_OPTIONS $* 2>$tmp.mkfserr 1>$tmp.mkfsstd > + ;; > *) > yes | $MKFS_PROG -t $FSTYP -- $MKFS_OPTIONS $* \ > 2>$tmp.mkfserr 1>$tmp.mkfsstd > @@ -826,6 +836,10 @@ _scratch_mkfs() > mkfs_cmd="yes | $MKFS_PROG -t $FSTYP --" > mkfs_filter="grep -v -e ^mkfs\.ocfs2" > ;; > + ntfs|ntfs3) > + mkfs_cmd="$MKFS_NTFS_PROG" > + mkfs_filter="cat" > + ;; > *) > mkfs_cmd="yes | $MKFS_PROG -t $FSTYP --" > mkfs_filter="cat" > @@ -1091,6 +1105,10 @@ _scratch_mkfs_sized() > bcachefs) > $MKFS_PROG -t $FSTYP -- $MKFS_OPTIONS --fs_size=$fssize --block_size=$blocksize $SCRATCH_DEV > ;; > + ntfs|ntfs3) > + ${MKFS_NTFS_PROG} $MKFS_OPTIONS $SCRATCH_DEV \ > + $(expr $blocks / 2) > + ;; > *) > _notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized" > ;; > @@ -1173,6 +1191,9 @@ _scratch_mkfs_blocksized() > ${MKFS_PROG} -t $FSTYP $MKFS_OPTIONS --block_size=$blocksize \ > $SCRATCH_DEV > ;; > + ntfs|ntfs3) > + ${MKFS_NTFS_PROG} -F $MKFS_OPTIONS -s $blocksize $SCRATCH_DEV > + ;; > *) > _notrun "Filesystem $FSTYP not supported in _scratch_mkfs_blocksized" > ;; > @@ -1247,6 +1268,10 @@ _repair_scratch_fs() > # want the test to fail: > _check_scratch_fs > ;; > + ntfs|ntfs3) > + $FSCK_NTFS_PROG $SCRATCH_DEV FSCK_NTFS_PROG variable is not set anywhere. > + return $? > + ;; > *) > local dev=$SCRATCH_DEV > local fstyp=$FSTYP > @@ -1294,6 +1319,10 @@ _repair_test_fs() > res=$? > fi > ;; > + ntfs|ntfs3) > + $FSCK_NTFS_PROG $TEST_DEV > $tmp.repair 2>&1 > + return $? > + ;; > *) > # Let's hope fsck -y suffices... > fsck -t $FSTYP -fy $TEST_DEV >$tmp.repair 2>&1 > @@ -1433,8 +1462,11 @@ _fs_type() > # Fix the filesystem type up here so that the callers don't > # have to bother with this quirk. > # > - _df_device $1 | $AWK_PROG '{ print $2 }' | \ > - sed -e 's/nfs4/nfs/' -e 's/fuse.glusterfs/glusterfs/' > + local sed_prog="-e s/nfs4/nfs/ -e s/fuse.glusterfs/glusterfs/" > + if [ $FSTYP = ntfs ]; then Do we need to check "ntfs3" here? > + sed_prog="$sed_prog -e s/fuseblk/ntfs/" > + fi > + _df_device $1 | $AWK_PROG '{ print $2 }' | sed $sed_prog > } > > # return the FS mount options of a mounted device > @@ -2897,6 +2929,9 @@ _is_dev_mounted() > exit 1 > fi > > + if [ $fstype = ntfs ]; then Same here, should "ntfs3" be checked as well? > + fstype=fuseblk > + fi > findmnt -rncv -S $dev -t $fstype -o TARGET | head -1 > } > > @@ -3017,11 +3052,15 @@ _pre_fsck_prepare() > _check_generic_filesystem() > { > local device=$1 > + local fsck_type=$2 > > # If type is set, we're mounted > local type=`_fs_type $device` > local ok=1 > > + if [ -z "$fsck_type" ]; then > + fsck_type="$FSTYP" > + fi > if [ "$type" = "$FSTYP" ] > then > # mounted ... > @@ -3029,7 +3068,7 @@ _check_generic_filesystem() > fi > > _pre_fsck_prepare $device > - fsck -t $FSTYP $FSCK_OPTIONS $device >$tmp.fsck 2>&1 > + fsck -t $fsck_type $FSCK_OPTIONS $device >$tmp.fsck 2>&1 > if [ $? -ne 0 ] > then > _log_err "_check_generic_filesystem: filesystem on $device is inconsistent" > @@ -3150,6 +3189,9 @@ _check_test_fs() > btrfs) > _check_btrfs_filesystem $TEST_DEV > ;; > + ntfs|ntfs3) > + _check_generic_filesystem $TEST_DEV $ntfs $ntfs variable is not set anywhere, I think it should be "ntfs" (not a variable)? Thanks, Eryu > + ;; > tmpfs) > # no way to check consistency for tmpfs > ;; > @@ -3211,6 +3253,9 @@ _check_scratch_fs() > btrfs) > _check_btrfs_filesystem $device > ;; > + ntfs|ntfs3) > + _check_generic_filesystem $device ntfs > + ;; > tmpfs) > # no way to check consistency for tmpfs > ;; > -- > 2.31.0
