apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: add support for ext4dev FSTYP

Browse Source 
blkid knows to identify the ext4dev FSTYP of a partition that was
formatted with mkfs.ext4dev.
quota tools and various util-linux utils are also aware of ext4dev,
so ext4dev shares the same capabilities as ext4.

Tested-by: Sergey Ivanov <sergey57@gmail.com>
Signed-off-by: Amir Goldstein <amir73il@users.sf.net>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
This commit is contained in:
Amir Goldstein
2011-06-02 22:35:18 -05:00
committed by Eric Sandeen
parent ff65626abd
commit 7c990a9b39
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.defrag
+1 -1
View File
@@ -26,7 +26,7 @@ _require_defrag()
xfs)
DEFRAG_PROG=/usr/sbin/xfs_fsr
;;
ext4)
ext4|ext4dev)
DEFRAG_PROG=/usr/bin/e4defrag
;;
*)
common.quota
+7 -3
View File
@@ -29,7 +29,7 @@ _require_quota()
[ -n $QUOTA_PROG ] || _notrun "Quota user tools not installed"
case $FSTYP in
ext2|ext3|ext4|reiserfs)
ext2|ext3|ext4|ext4dev|reiserfs)
if [ ! -d /proc/sys/fs/quota ]; then
_notrun "Installed kernel does not support quotas"
fi
@@ -237,10 +237,14 @@ _check_quota_usage()
# Sync to get delalloc to disk
sync
VFS_QUOTA=0
if [ $FSTYP = "ext2" -o $FSTYP = "ext3" -o $FSTYP = "ext4" -o $FSTYP = "reiserfs" ]; then
case $FSTYP in
ext2|ext3|ext4|ext4dev|reiserfs)
VFS_QUOTA=1
quotaon -f -u -g $SCRATCH_MNT 2>/dev/null
fi
;;
*)
;;
esac
repquota -u -n $SCRATCH_MNT | grep -v "^#0" | _filter_scratch |
sort >$tmp.user.orig
repquota -g -n $SCRATCH_MNT | grep -v "^#0" | _filter_scratch |
common.rc
+5 -5
View File
@@ -65,7 +65,7 @@ _mount_opts()
nfs)
export MOUNT_OPTIONS=$NFS_MOUNT_OPTIONS
;;
ext2|ext3|ext4)
ext2|ext3|ext4|ext4dev)
# acls & xattrs aren't turned on by default on ext$FOO
export MOUNT_OPTIONS="-o acl,user_xattr $EXT_MOUNT_OPTIONS"
;;
@@ -110,7 +110,7 @@ _mkfs_opts()
_fsck_opts()
{
case $FSTYP in
ext2|ext3|ext4)
ext2|ext3|ext4|ext4dev)
export FSCK_OPTIONS="-nf"
;;
reiserfs)
@@ -326,10 +326,10 @@ _scratch_mkfs_sized()
xfs)
_scratch_mkfs_xfs -d size=$fssize -b size=$blocksize
;;
ext2|ext3|ext4)
ext2|ext3|ext4|ext4dev)
/sbin/mkfs.$FSTYP $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
;;
btrfs)
btrfs)
/sbin/mkfs.$FSTYP $MKFS_OPTIONS $SCRATCH_DEV -b $fssize
;;
*)
@@ -354,7 +354,7 @@ _scratch_mkfs_geom()
xfs)
MKFS_OPTIONS+=" -b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
;;
ext4)
ext4|ext4dev)
MKFS_OPTIONS+=" -b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks"
;;
*)