On 3/10/25 16:02, Zorro Lang wrote: > On Mon, Mar 10, 2025 at 03:16:36PM +0800, Zorro Lang wrote: >> On Fri, Mar 07, 2025 at 02:56:29PM +1100, David Disseldorp wrote: >>> On Thu, 6 Mar 2025 16:18:06 +0800, Chao Yu wrote: >>> >>>> F2FS_IO_PROG was been exported twice, remove the redudant one. >>>> >>>> Cc: Jaegeuk Kim <jaegeuk@xxxxxxxxxx> >>>> Signed-off-by: Chao Yu <chao@xxxxxxxxxx> >>>> --- >>>> common/config | 1 - >>>> 1 file changed, 1 deletion(-) >>>> >>>> diff --git a/common/config b/common/config >>>> index 2afbda14..8d3047a5 100644 >>>> --- a/common/config >>>> +++ b/common/config >>>> @@ -191,7 +191,6 @@ 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)" >>> >>> Looks good. @Zorro, might as well squash in removal of the duplicate >>> TIMEOUT_PROG export too. >> >> Sure, I roughly tried to find all duplication by: >> >> $ for prog in `sed -n "/export/s/export \(.*_PROG\)=.*/\1/p" common/config `;do n=`grep -E "\b$prog=" common/config|wc -l`;if [ $n -gt 1 ];then grep "\b$prog=" common/config;fi;done >> >> Currently only found F2FS_IO_PROG and TIMEOUT_PROG. So I'll change this patch >> commit to: >> >> common/config: remove redundant export variables >> >> F2FS_IO_PROG and TIMEOUT_PROG are exported twice, remove the >> redundant one. > > Hi Chao, > > As you need to change patch 4/4 more. I thought you might change others, so > please change this patch refer to below:) Zorro, yes, let me update all in v2, thank you! Thanks, > > Thanks, > Zorro > > Author: Chao Yu <chao@xxxxxxxxxx> > Date: Thu Mar 6 16:18:06 2025 +0800 > > common/config: remove redundant export variables > > F2FS_IO_PROG and TIMEOUT_PROG are exported twice, remove the redudant > one. > > Cc: Jaegeuk Kim <jaegeuk@xxxxxxxxxx> > Signed-off-by: Chao Yu <chao@xxxxxxxxxx> > Reviewed-by: David Disseldorp <ddiss@xxxxxxx> > > > diff --git a/common/config b/common/config > index 2afbda141..aa5258250 100644 > --- a/common/config > +++ b/common/config > @@ -191,7 +191,6 @@ 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)" > @@ -220,7 +219,6 @@ export UBIUPDATEVOL_PROG="$(type -P ubiupdatevol)" > export THIN_CHECK_PROG="$(type -P thin_check)" > export PYTHON3_PROG="$(type -P python3)" > export SQLITE3_PROG="$(type -P sqlite3)" > -export TIMEOUT_PROG="$(type -P timeout)" > export SETCAP_PROG="$(type -P setcap)" > export GETCAP_PROG="$(type -P getcap)" > export CAPSH_PROG="$(type -P capsh)" > >> >> Thanks, >> Zorro >> >>> >>> Reviewed-by: David Disseldorp <ddiss@xxxxxxx> >>> >
