From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E736DECE58E for ; Tue, 15 Oct 2019 09:55:26 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4DAF2089C; Tue, 15 Oct 2019 09:55:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="GC+p4do8"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="WnR89AvO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4DAF2089C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1iKJY6-0008IM-2u; Tue, 15 Oct 2019 09:55:26 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iKJY4-0008I8-N8 for linux-f2fs-devel@lists.sourceforge.net; Tue, 15 Oct 2019 09:55:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:CC:To:Subject:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DsBWDRRK+irMS6v8hoDfSLib1yY/JYQGwhtqJoU2PnM=; b=GC+p4do83diK9jZ9Yy9xbpRrCo pLka9N7VNKZBLgf3PnfiSRi98WdPtPo4xVBYsoWhwY8mbBsdQ9hSG2/sbyvy7V3aXsDIjFe0JS21u EslH2oof5jp7+oWUHsOupQRMxeB+HYa78DXvEqM6600CkgprhQ3a9HhWJFqAZyGWNpfs=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:CC:To:Subject:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=DsBWDRRK+irMS6v8hoDfSLib1yY/JYQGwhtqJoU2PnM=; b=WnR89AvO1b6GaS9ZQnlxCkALLx eiTAdgDyeR6ZuvPtKZjwziLZKVuoiAzalmL0GgQWijGynoy662Rcthnb9SEwxnjNrEvcF3hIaAwGe uwSvWbfWIbRKH7HWMw2Fn5MUpg2jA7Lye9s61JXOYu7qUbAdFO0kbgxP291YNJ8VjmxI=; Received: from szxga04-in.huawei.com ([45.249.212.190] helo=huawei.com) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1iKJY2-001wPa-1U for linux-f2fs-devel@lists.sourceforge.net; Tue, 15 Oct 2019 09:55:24 +0000 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 4562C3B1048D65315235; Tue, 15 Oct 2019 17:55:14 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.207) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 15 Oct 2019 17:55:08 +0800 To: Eryu Guan References: <20190927100627.9086-1-yuchao0@huawei.com> <20191002105956.GZ2622@desktop> From: Chao Yu Message-ID: Date: Tue, 15 Oct 2019 17:55:08 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20191002105956.GZ2622@desktop> Content-Language: en-US X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Headers-End: 1iKJY2-001wPa-1U Subject: Re: [f2fs-dev] [PATCH 1/2] common/defrag: support f2fs X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2019/10/2 18:59, Eryu Guan wrote: > On Fri, Sep 27, 2019 at 06:06:26PM +0800, Chao Yu wrote: >> F2FS supports defragment based on file granularity, adjust test suit >> to support f2fs. >> >> Signed-off-by: Chao Yu >> --- >> common/config | 2 ++ >> common/defrag | 11 ++++++++++- >> 2 files changed, 12 insertions(+), 1 deletion(-) >> >> diff --git a/common/config b/common/config >> index 4c86a492..c43be339 100644 >> --- a/common/config >> +++ b/common/config >> @@ -176,6 +176,7 @@ export XFS_COPY_PROG="$(type -P xfs_copy)" >> export FSTRIM_PROG="$(type -P fstrim)" >> export DUMPE2FS_PROG="$(type -P dumpe2fs)" >> export RESIZE2FS_PROG="$(type -P resize2fs)" >> +export F2FS_IO_PROG="$(type -P f2fs_io)" >> export FIO_PROG="$(type -P fio)" >> export FILEFRAG_PROG="$(type -P filefrag)" >> export E4DEFRAG_PROG="$(type -P e4defrag)" >> @@ -240,6 +241,7 @@ case "$HOSTOS" in >> export MKFS_BTRFS_PROG=$(set_mkfs_prog_path_with_opts btrfs) >> export MKFS_F2FS_PROG=$(set_mkfs_prog_path_with_opts f2fs) >> export DUMP_F2FS_PROG=$(type -P dump.f2fs) >> + export F2FS_IO_PROG=$(type -P f2fs_io) >> export BTRFS_UTIL_PROG=$(type -P btrfs) >> export BTRFS_SHOW_SUPER_PROG=$(type -P btrfs-show-super) >> export BTRFS_CONVERT_PROG=$(type -P btrfs-convert) >> diff --git a/common/defrag b/common/defrag >> index 2bd739c0..9866d3da 100644 >> --- a/common/defrag >> +++ b/common/defrag >> @@ -27,6 +27,9 @@ _require_defrag() >> rm -f $testfile $donorfile 2>&1 > /dev/null >> DEFRAG_PROG="$E4DEFRAG_PROG" >> ;; >> + f2fs) >> + DEFRAG_PROG="$F2FS_IO_PROG defrag_file" >> + ;; >> btrfs) >> DEFRAG_PROG="$BTRFS_UTIL_PROG filesystem defragment" >> ;; >> @@ -140,7 +143,13 @@ _defrag() >> >> [ ! -z $csum ] && CSUM_BEFORE=`md5sum $1` >> STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1` >> - $DEFRAG_PROG -v $1 >> $seqres.full 2>&1 >> + >> + if [ $FSTYP == "f2fs" ]; then >> + _filesize=`ls -l $1 | $AWK_PROG '{print $5}'` Sorry for later reply. > > Better to declare "filesize" as a local variable here. > > local filesize=`stat -c %s $1` Will update to use below code here: local filesize=`ls -l $1 | $AWK_PROG '{print $5}'` Thanks, > > Otherwise looks fine to me. > > But it'd be better to let other f2fs developers review this patchset as > well. > > Thanks, > Eryu > >> + $DEFRAG_PROG 0 $_filesize $1 >> $seqres.full 2>&1 >> + else >> + $DEFRAG_PROG -v $1 >> $seqres.full 2>&1 >> + fi >> >> _scratch_cycle_mount >> STAT_AFTER=`stat -c "a: %x m: %y c: %z" $1` >> -- >> 2.18.0.rc1 >> > . > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel