From: "Amir G." Subject: Re: [PATCH v2] xfstests: add support for ext4dev FSTYP Date: Thu, 2 Jun 2011 05:33:34 +0300 Message-ID: References: <1306933012-8666-1-git-send-email-amir73il@users.sourceforge.net> <20110601232804.GL32466@dastard> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: xfs@oss.sgi.com, sandeen@redhat.com, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, sergey57@gmail.com, Amir Goldstein To: Dave Chinner Return-path: Received: from mail-ww0-f44.google.com ([74.125.82.44]:40405 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758966Ab1FBCdg convert rfc822-to-8bit (ORCPT ); Wed, 1 Jun 2011 22:33:36 -0400 In-Reply-To: Sender: linux-ext4-owner@vger.kernel.org List-ID: On Thu, Jun 2, 2011 at 5:16 AM, Amir G. wrote: > On Thu, Jun 2, 2011 at 2:28 AM, Dave Chinner wr= ote: >> On Wed, Jun 01, 2011 at 03:56:52PM +0300, amir73il@users.sourceforge= =2Enet wrote: >>> From: Amir Goldstein >>> >>> 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. >>> >>> 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). >>> >>> v1 -> v2: >>> - undo change of fsck -t $FSTYP to fsck.$FSTYP >>> >>> =A0common.defrag | =A0 =A02 +- >>> =A0common.quota =A0| =A0 =A04 ++-- >>> =A0common.rc =A0 =A0 | =A0 10 +++++----- >>> =A03 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() >>> =A0 =A0 =A0xfs) >>> =A0 =A0 =A0 =A0 =A0DEFRAG_PROG=3D/usr/sbin/xfs_fsr >>> =A0 =A0 =A0 ;; >>> - =A0 =A0ext4) >>> + =A0 =A0ext4|ext4dev) >>> =A0 =A0 =A0 =A0 =A0DEFRAG_PROG=3D/usr/bin/e4defrag >>> =A0 =A0 =A0 ;; >>> =A0 =A0 =A0*) >>> diff --git a/common.quota b/common.quota >>> index 3c87ce1..b6d5f16 100644 >>> --- a/common.quota >>> +++ b/common.quota >>> @@ -29,7 +29,7 @@ _require_quota() >>> =A0 =A0 =A0[ -n $QUOTA_PROG ] || _notrun "Quota user tools not inst= alled" >>> >>> =A0 =A0 =A0case $FSTYP in >>> - =A0 =A0ext2|ext3|ext4|reiserfs) >>> + =A0 =A0ext2|ext3|ext4|ext4dev|reiserfs) >>> =A0 =A0 =A0 if [ ! -d /proc/sys/fs/quota ]; then >>> =A0 =A0 =A0 =A0 =A0 _notrun "Installed kernel does not support quot= as" >>> =A0 =A0 =A0 fi >>> @@ -237,7 +237,7 @@ _check_quota_usage() >>> =A0 =A0 =A0 # Sync to get delalloc to disk >>> =A0 =A0 =A0 sync >>> =A0 =A0 =A0 VFS_QUOTA=3D0 >>> - =A0 =A0 if [ $FSTYP =3D "ext2" -o $FSTYP =3D "ext3" -o $FSTYP =3D= "ext4" -o $FSTYP =3D "reiserfs" ]; then >>> + =A0 =A0 if [ $FSTYP =3D "ext2" -o $FSTYP =3D "ext3" -o $FSTYP =3D= "ext4" -o $FSTYP =3D "ext4dev" -o $FSTYP =3D "reiserfs" ]; then >>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 VFS_QUOTA=3D1 >>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 quotaon -f -u -g $SCRATCH_MNT 2>/dev/nu= ll >>> =A0 =A0 =A0 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 b= locks 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 upgra= ding util-linux should be a requirement for xfstests to work. >> Cheers, >> >> Dave. >> >> -- >> Dave Chinner >> david@fromorbit.com >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-ext4= " in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at =A0http://vger.kernel.org/majordomo-info.html >> > -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html