_check_generic_filesystem() will fail the test once it detects
corruption, let's introduce _check_f2fs_filesystem() to just check
filesystem w/ --dry-run option, and return the error number, then
let caller to decide whether the corruption is as expected or not.
Cc: Jaegeuk Kim <jaeg...@kernel.org>
Signed-off-by: Chao Yu <c...@kernel.org>
---
common/rc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/common/rc b/common/rc
index ac2bac81..cabd44de 100644
--- a/common/rc
+++ b/common/rc
@@ -3527,6 +3527,50 @@ _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()
{
@@ -3631,6 +3675,9 @@ _check_test_fs()
ubifs)
# there is no fsck program for ubifs yet
;;
+ f2fs)
+ _check_f2fs_filesystem $TEST_DEV
+ ;;
*)
_check_generic_filesystem $TEST_DEV
;;
@@ -3687,6 +3734,9 @@ _check_scratch_fs()
ubifs)
# there is no fsck program for ubifs yet
;;
+ f2fs)
+ _check_f2fs_filesystem $device
+ ;;
*)
_check_generic_filesystem $device
;;
--
2.48.1
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
