On 6/1/11 11:17 PM, amir73il@xxxxxxxxxxxxxxxxxxxxx wrote: > From: Amir Goldstein <amir73il@xxxxxxxxxxxx> > > 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. > > Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxxxxx> > Tested-by: Sergey Ivanov <sergey57@xxxxxxxxx> > --- > ext4dev is used to test experimental ext4 code in mutual existance > with production ext4 code on the same system. > > Specifically, ext4 snapshots code is available for testing as a > stand-alone ext4dev module for Fedora 15 and Ubuntu 11.4 > (see http://next3.sf.net). > > v2 -> v3: > - change if to case statement > > v1 -> v2: > - undo change of fsck -t $FSTYP to fsck.$FSTYP looks good to me, and thanks for fixing up the case statement :) I'll merge this tonight to the xfstests-dev tree. -Eric > common.defrag | 2 +- > common.quota | 10 +++++++--- > common.rc | 10 +++++----- > 3 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/common.defrag b/common.defrag > index 1bcf01d..4850803 100644 > --- a/common.defrag > +++ b/common.defrag > @@ -26,7 +26,7 @@ _require_defrag() > xfs) > DEFRAG_PROG=/usr/sbin/xfs_fsr > ;; > - ext4) > + ext4|ext4dev) > DEFRAG_PROG=/usr/bin/e4defrag > ;; > *) > diff --git a/common.quota b/common.quota > index 3c87ce1..9736306 100644 > --- a/common.quota > +++ b/common.quota > @@ -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 | > diff --git a/common.rc b/common.rc > index e634fbb..c510c66 100644 > --- a/common.rc > +++ b/common.rc > @@ -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" > ;; > *) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
