From: Chao Yu <chao@kernel.org>
To: Zorro Lang <zlang@kernel.org>, fstests@vger.kernel.org
Cc: jaegeuk@kernel.org, linux-f2fs-devel@lists.sourceforge.net,
Chao Yu <chao@kernel.org>
Subject: [PATCH v4 5/6] common/rc: introduce _check_f2fs_filesystem()
Date: Wed, 12 Mar 2025 15:23:08 +0800 [thread overview]
Message-ID: <20250312072309.3989074-5-chao@kernel.org> (raw)
In-Reply-To: <20250312072309.3989074-1-chao@kernel.org>
_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 <jaegeuk@kernel.org>
Signed-off-by: Chao Yu <chao@kernel.org>
---
v4:
- clean up $FSTYP and $FSCK_OPTIONS
- dump formated logs to seqres.full once fsck detects the corruption.
common/rc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/common/rc b/common/rc
index 23b642f4..43d3fe42 100644
--- a/common/rc
+++ b/common/rc
@@ -3519,6 +3519,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()
{
@@ -3623,6 +3667,9 @@ _check_test_fs()
ubifs)
# there is no fsck program for ubifs yet
;;
+ f2fs)
+ _check_f2fs_filesystem $TEST_DEV
+ ;;
*)
_check_generic_filesystem $TEST_DEV
;;
@@ -3679,6 +3726,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
next prev parent reply other threads:[~2025-03-12 7:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-12 7:23 [PATCH v4 1/6] common/config: remove redundant export variables Chao Yu
2025-03-12 7:23 ` [PATCH v4 2/6] common/config: export F2FS_INJECT_PROG Chao Yu
2025-03-12 7:23 ` [PATCH v4 3/6] common/config: export F2FS_FSCK_PROG Chao Yu
2025-03-12 7:23 ` [PATCH v4 4/6] common/rc: use -f for mkfs.f2fs by default Chao Yu
2025-03-12 7:23 ` Chao Yu [this message]
2025-03-12 7:23 ` [PATCH v4 6/6] f2fs/009: detect and repair nlink corruption Chao Yu
2025-03-25 1:07 ` Zorro Lang
2025-03-25 6:54 ` Chao Yu
2025-03-25 9:15 ` Dave Chinner
2025-03-25 12:55 ` 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=20250312072309.3989074-5-chao@kernel.org \
--to=chao@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=zlang@kernel.org \
/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