On Thu, Oct 09, 2025 at 04:50:42PM +0800, Chao Yu wrote: > _check_f2fs_filesystem() is f2fs specific, it's better to move it to > common/f2fs. > > Cc: Jaegeuk Kim <[email protected]> > Signed-off-by: Chao Yu <[email protected]> > ---
Looks good to me. With the patch 1/3, this change should work for f2fs too. Reviewed-by: Zorro Lang <[email protected]> > common/f2fs | 44 ++++++++++++++++++++++++++++++++++++++++++++ > common/rc | 44 -------------------------------------------- > 2 files changed, 44 insertions(+), 44 deletions(-) > > diff --git a/common/f2fs b/common/f2fs > index 1b39d8ce..4d0d688b 100644 > --- a/common/f2fs > +++ b/common/f2fs > @@ -25,3 +25,47 @@ _require_scratch_f2fs_compression() > _scratch_unmount > fi > } > + > +_check_f2fs_filesystem() > +{ > + local device=$1 > + > + # If type is set, we're mounted > + local type=`_fs_type $device` > + local ok=1 > + > + if [ "$type" = "f2fs" ] > + then > + # mounted ... > + local mountpoint=`_umount_or_remount_ro $device` > + fi > + > + $F2FS_FSCK_PROG --dry-run $device >$tmp.fsck.f2fs 2>&1 > + if [ $? -ne 0 ];then > + _log_err "_check_f2fs_filesystem: filesystem on $device is > inconsistent" > + echo "*** fsck.f2fs output ***" >>$seqres.full > + cat $tmp.fsck.f2fs >>$seqres.full > + echo "*** end fsck.f2fs output" >>$seqres.full > + > + ok=0 > + fi > + rm -f $tmp.fsck.f2fs > + > + if [ $ok -eq 0 ] > + then > + echo "*** mount output ***" >>$seqres.full > + _mount >>$seqres.full > + echo "*** end mount output" >>$seqres.full > + elif [ "$type" = "f2fs" ] > + then > + # was mounted ... > + _mount_or_remount_rw "$MOUNT_OPTIONS" $device $mountpoint > + ok=$? > + fi > + > + if [ $ok -eq 0 ]; then > + return 1 > + fi > + > + return 0 > +} > diff --git a/common/rc b/common/rc > index 1ec84263..4d121a1b 100644 > --- a/common/rc > +++ b/common/rc > @@ -3566,50 +3566,6 @@ _check_generic_filesystem() > return 0 > } > > -_check_f2fs_filesystem() > -{ > - local device=$1 > - > - # If type is set, we're mounted > - local type=`_fs_type $device` > - local ok=1 > - > - if [ "$type" = "f2fs" ] > - then > - # mounted ... > - local mountpoint=`_umount_or_remount_ro $device` > - fi > - > - $F2FS_FSCK_PROG --dry-run $device >$tmp.fsck.f2fs 2>&1 > - if [ $? -ne 0 ];then > - _log_err "_check_f2fs_filesystem: filesystem on $device is > inconsistent" > - echo "*** fsck.f2fs output ***" >>$seqres.full > - cat $tmp.fsck.f2fs >>$seqres.full > - echo "*** end fsck.f2fs output" >>$seqres.full > - > - ok=0 > - fi > - rm -f $tmp.fsck.f2fs > - > - if [ $ok -eq 0 ] > - then > - echo "*** mount output ***" >>$seqres.full > - _mount >>$seqres.full > - echo "*** end mount output" >>$seqres.full > - elif [ "$type" = "f2fs" ] > - then > - # was mounted ... > - _mount_or_remount_rw "$MOUNT_OPTIONS" $device $mountpoint > - ok=$? > - fi > - > - if [ $ok -eq 0 ]; then > - return 1 > - fi > - > - return 0 > -} > - > # Filter the knowen errors the UDF Verifier reports. > _udf_test_known_error_filter() > { > -- > 2.40.1 > _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
