From patchwork Wed Jun 1 03:13:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 98106 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A0DCCB6F81 for ; Wed, 1 Jun 2011 13:14:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933175Ab1FADOC (ORCPT ); Tue, 31 May 2011 23:14:02 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:63285 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933108Ab1FADOB (ORCPT ); Tue, 31 May 2011 23:14:01 -0400 Received: by wwa36 with SMTP id 36so5541241wwa.1 for ; Tue, 31 May 2011 20:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to:cc :content-type; bh=n/dzG0+4AVhmj8sP3OH7zHU8GCW/910EKtcQW15KAl8=; b=K6kr10jGBIniIur6vOfuFo7S34D648kKe7sUacEiBp6NmRInijWA05t/+C81k/utjQ NBCuXrqZ42HBFSjeBqNg5rkDRzrlFkRv3kO/Vyr9FgBsT/5sixy8RYwqZJHAJXVfQ9Ef o8qkIrYtFT26Nds58zuQ/RRD6tLs47stblLo0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=RyBRfHvSFVmTPbtmgAgpm7JC8GbStdEU18l2TUHm/pIq1/fhdINR22h2eWTKLn1t9O oNBgPUeYuX09GeTJpYOSG/EzaFJTKkT4PFVH2IVAWMx18ScuuzaaPK2oqBxYLP6wybIk x3MbVxZuQSviBIYBwG52KYMOCdKQi8JEcyc6c= MIME-Version: 1.0 Received: by 10.216.235.129 with SMTP id u1mr4169009weq.108.1306898039769; Tue, 31 May 2011 20:13:59 -0700 (PDT) Received: by 10.216.221.135 with HTTP; Tue, 31 May 2011 20:13:59 -0700 (PDT) Date: Wed, 1 Jun 2011 06:13:59 +0300 Message-ID: Subject: [PATCH] xfstests: add support for ext4dev FSTYP From: Amir Goldstein To: XFS Cc: Sergey Ivanov , Eric Sandeen , Ext4 Developers List , linux-fsdevel Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Amir Goldstein 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. While testing on Fedora 15, we encoutered a buggy fsck utility, which invokes fsck.ext4, even though it was called with -t ext4dev argument. In our setup fsck.ext4dev knows about new fs features that fsck.ext4 doesn't know, so the generic_fs_check fails. Since we have no real use of the extra capabilities provided by fsck util, we decided to invoke fsck.$FSTYP directly to avoid this issue. Signed-off-by: Amir Goldstein Tested-by: Sergey Ivanov --- 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). common.defrag | 2 +- common.quota | 4 ++-- common.rc | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) *) @@ -1026,7 +1026,7 @@ _check_generic_filesystem() mountpoint=`_umount_or_remount_ro $device` fi - fsck -t $FSTYP $FSCK_OPTIONS $device >$tmp.fsck 2>&1 + fsck.$FSTYP $FSCK_OPTIONS $device >$tmp.fsck 2>&1 if [ $? -ne 0 ] then echo "_check_generic_filesystem: filesystem on $device is inconsistent (see $seq.full)" 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..9eac19d 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 diff --git a/common.rc b/common.rc index e634fbb..e71fe9c 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" ;;