fstests.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eryu Guan <guaneryu@gmail.com>
To: Chao Yu <yuchao0@huawei.com>
Cc: fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net
Subject: Re: [PATCH 1/2] common/defrag: support f2fs
Date: Wed, 2 Oct 2019 18:59:59 +0800	[thread overview]
Message-ID: <20191002105956.GZ2622@desktop> (raw)
In-Reply-To: <20190927100627.9086-1-yuchao0@huawei.com>

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 <yuchao0@huawei.com>
> ---
>  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}'`

Better to declare "filesize" as a local variable here.

		local filesize=`stat -c %s $1`

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
> 

  parent reply	other threads:[~2019-10-02 11:00 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-27 10:06 [PATCH 1/2] common/defrag: support f2fs Chao Yu
2019-09-27 10:06 ` Chao Yu
2019-09-27 10:06 ` [PATCH 2/2] common/casefold: " Chao Yu
2019-09-27 10:06   ` Chao Yu
2019-10-02 10:59 ` Eryu Guan [this message]
2019-10-15  9:55   ` [PATCH 1/2] common/defrag: " Chao Yu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191002105956.GZ2622@desktop \
    --to=guaneryu@gmail.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=yuchao0@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).