* [PATCH 1/2] common/defrag: support f2fs
@ 2019-09-27 10:06 Chao Yu
2019-09-27 10:06 ` Chao Yu
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Chao Yu @ 2019-09-27 10:06 UTC (permalink / raw)
To: guaneryu; +Cc: fstests, linux-f2fs-devel, Chao Yu
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}'`
+ $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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] common/defrag: support f2fs
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-10-02 10:59 ` [PATCH 1/2] common/defrag: " Eryu Guan
2 siblings, 0 replies; 6+ messages in thread
From: Chao Yu @ 2019-09-27 10:06 UTC (permalink / raw)
To: guaneryu; +Cc: fstests, linux-f2fs-devel, Chao Yu
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}'`
+ $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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] common/casefold: support f2fs
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 ` Chao Yu
2019-09-27 10:06 ` Chao Yu
2019-10-02 10:59 ` [PATCH 1/2] common/defrag: " Eryu Guan
2 siblings, 1 reply; 6+ messages in thread
From: Chao Yu @ 2019-09-27 10:06 UTC (permalink / raw)
To: guaneryu; +Cc: fstests, linux-f2fs-devel, Chao Yu
Now, f2fs has ported casefold feature from ext4, let's enable the
testcase.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
common/casefold | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/common/casefold b/common/casefold
index 2a7ab3eb..9172d818 100644
--- a/common/casefold
+++ b/common/casefold
@@ -9,6 +9,9 @@ _has_casefold_kernel_support()
ext4)
test -f '/sys/fs/ext4/features/casefold'
;;
+ f2fs)
+ test -f '/sys/fs/f2fs/features/casefold'
+ ;;
*)
# defaults to unsupported
false
@@ -46,6 +49,9 @@ _scratch_mkfs_casefold()
ext4)
_scratch_mkfs -O casefold $*
;;
+ f2fs)
+ _scratch_mkfs -C utf8 $*
+ ;;
*)
_notrun "Don't know how to mkfs with casefold support on $FSTYP"
;;
@@ -58,6 +64,9 @@ _scratch_mkfs_casefold_strict()
ext4)
_scratch_mkfs -O casefold -E encoding_flags=strict
;;
+ f2fs)
+ _scratch_mkfs -C utf8:strict
+ ;;
*)
_notrun "Don't know how to mkfs with casefold-strict support on $FSTYP"
;;
--
2.18.0.rc1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] common/casefold: support f2fs
2019-09-27 10:06 ` [PATCH 2/2] common/casefold: " Chao Yu
@ 2019-09-27 10:06 ` Chao Yu
0 siblings, 0 replies; 6+ messages in thread
From: Chao Yu @ 2019-09-27 10:06 UTC (permalink / raw)
To: guaneryu; +Cc: fstests, linux-f2fs-devel, Chao Yu
Now, f2fs has ported casefold feature from ext4, let's enable the
testcase.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
common/casefold | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/common/casefold b/common/casefold
index 2a7ab3eb..9172d818 100644
--- a/common/casefold
+++ b/common/casefold
@@ -9,6 +9,9 @@ _has_casefold_kernel_support()
ext4)
test -f '/sys/fs/ext4/features/casefold'
;;
+ f2fs)
+ test -f '/sys/fs/f2fs/features/casefold'
+ ;;
*)
# defaults to unsupported
false
@@ -46,6 +49,9 @@ _scratch_mkfs_casefold()
ext4)
_scratch_mkfs -O casefold $*
;;
+ f2fs)
+ _scratch_mkfs -C utf8 $*
+ ;;
*)
_notrun "Don't know how to mkfs with casefold support on $FSTYP"
;;
@@ -58,6 +64,9 @@ _scratch_mkfs_casefold_strict()
ext4)
_scratch_mkfs -O casefold -E encoding_flags=strict
;;
+ f2fs)
+ _scratch_mkfs -C utf8:strict
+ ;;
*)
_notrun "Don't know how to mkfs with casefold-strict support on $FSTYP"
;;
--
2.18.0.rc1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] common/defrag: support f2fs
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-10-02 10:59 ` Eryu Guan
2019-10-15 9:55 ` Chao Yu
2 siblings, 1 reply; 6+ messages in thread
From: Eryu Guan @ 2019-10-02 10:59 UTC (permalink / raw)
To: Chao Yu; +Cc: fstests, linux-f2fs-devel
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] common/defrag: support f2fs
2019-10-02 10:59 ` [PATCH 1/2] common/defrag: " Eryu Guan
@ 2019-10-15 9:55 ` Chao Yu
0 siblings, 0 replies; 6+ messages in thread
From: Chao Yu @ 2019-10-15 9:55 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, linux-f2fs-devel
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 <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}'`
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
>>
> .
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-15 9:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 1/2] common/defrag: " Eryu Guan
2019-10-15 9:55 ` Chao Yu
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).