On Thu, Jun 2, 2011 at 5:16 AM, Amir G. <amir73il@xxxxxxxxxxxxxxxxxxxxx> wrote: > On Thu, Jun 2, 2011 at 2:28 AM, Dave Chinner <david@xxxxxxxxxxxxx> wrote: >> On Wed, Jun 01, 2011 at 03:56:52PM +0300, amir73il@xxxxxxxxxxxxxxxxxxxxx wrote: >>> From: Amir Goldstein <amir73il@xxxxxxxxxxxx> >>> >>> 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). >>> >>> v1 -> v2: >>> - undo change of fsck -t $FSTYP to fsck.$FSTYP >>> >>> common.defrag | 2 +- >>> common.quota | 4 ++-- >>> common.rc | 10 +++++----- >>> 3 files changed, 8 insertions(+), 8 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..b6d5f16 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,7 +237,7 @@ _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 >>> + if [ $FSTYP = "ext2" -o $FSTYP = "ext3" -o $FSTYP = "ext4" -o $FSTYP = "ext4dev" -o $FSTYP = "reiserfs" ]; then >>> VFS_QUOTA=1 >>> quotaon -f -u -g $SCRATCH_MNT 2>/dev/null >>> fi >> >> Perhaps this should be changes to a case statement? >> > > you're making me go to v3 in such a trivial patch, but ok, I'll do it ;-) > I rechecked the fsck -t ext4dev vs. fsck.ext4dev. fsck -t ext4dev doesn't work for me :-( Sergey has a newer version of util-linux-ng see: amir@qalab:~/xfstests$ sudo fsck -t ext4dev -nf /dev/sda5 fsck from util-linux-ng 2.17.2 e2fsck 1.41.14 (22-Dec-2010) /dev/sda5 has unsupported feature(s): FEATURE_C7 FEATURE_C8 FEATURE_R7 e2fsck: Get a newer version of e2fsck! amir@qalab:~/xfstests$ sudo fsck.ext4dev -nf /dev/sda5 e2fsck 1.41.14-next3-1.0.13-7 (24-May-2011) Checking snapshots: 1,done Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure Pass 3: Checking directory connectivity Pass 4: Checking reference counts Pass 5: Checking group summary information /dev/sda5: 6596/6561792 files (3.6% non-contiguous), 1242522/26216064 blocks amir@qalab:~/xfstests$ What do you thing, Dave? Should xfstests rely on a non-buggy generic fsck util, or just implement it's own non-buggy generic fsck (invoke fsck.$FSTYP directly) I am running a recent system (Ubuntu 11.4) and I don't thing that upgrading util-linux should be a requirement for xfstests to work. >> Cheers, >> >> Dave. >> >> -- >> Dave Chinner >> david@xxxxxxxxxxxxx >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in >> the body of a message to majordomo@xxxxxxxxxxxxxxx >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > -- 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
