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 v5 5/6] common/rc: introduce _check_f2fs_filesystem()
Date: Tue, 25 Mar 2025 20:58:23 +0800 [thread overview]
Message-ID: <20250325125824.3367060-5-chao@kernel.org> (raw)
In-Reply-To: <20250325125824.3367060-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>
---
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
WARNING: multiple messages have this Message-ID (diff)
From: Chao Yu via Linux-f2fs-devel <linux-f2fs-devel@lists.sourceforge.net>
To: Zorro Lang <zlang@kernel.org>, fstests@vger.kernel.org
Cc: jaegeuk@kernel.org, linux-f2fs-devel@lists.sourceforge.net
Subject: [f2fs-dev] [PATCH v5 5/6] common/rc: introduce _check_f2fs_filesystem()
Date: Tue, 25 Mar 2025 20:58:23 +0800 [thread overview]
Message-ID: <20250325125824.3367060-5-chao@kernel.org> (raw)
In-Reply-To: <20250325125824.3367060-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>
---
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
next prev parent reply other threads:[~2025-03-25 12:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-25 12:58 [PATCH v5 1/6] common/config: remove redundant export variables Chao Yu
2025-03-25 12:58 ` [f2fs-dev] " Chao Yu via Linux-f2fs-devel
2025-03-25 12:58 ` [PATCH v5 2/6] common/config: export F2FS_INJECT_PROG Chao Yu
2025-03-25 12:58 ` [f2fs-dev] " Chao Yu via Linux-f2fs-devel
2025-03-25 12:58 ` [PATCH v5 3/6] common/config: export F2FS_FSCK_PROG Chao Yu
2025-03-25 12:58 ` [f2fs-dev] " Chao Yu via Linux-f2fs-devel
2025-03-25 12:58 ` [PATCH v5 4/6] common/rc: use -f for mkfs.f2fs by default Chao Yu
2025-03-25 12:58 ` [f2fs-dev] " Chao Yu via Linux-f2fs-devel
2025-03-25 12:58 ` Chao Yu [this message]
2025-03-25 12:58 ` [f2fs-dev] [PATCH v5 5/6] common/rc: introduce _check_f2fs_filesystem() Chao Yu via Linux-f2fs-devel
2025-03-25 12:58 ` [PATCH v5 6/6] f2fs/009: detect and repair nlink corruption Chao Yu
2025-03-25 12:58 ` [f2fs-dev] " Chao Yu via Linux-f2fs-devel
2025-03-25 23:20 ` Dave Chinner
2025-03-25 23:20 ` [f2fs-dev] " Dave Chinner via Linux-f2fs-devel
2025-03-26 0:47 ` Zorro Lang
2025-03-26 0:47 ` [f2fs-dev] " Zorro Lang via Linux-f2fs-devel
2025-03-26 3:24 ` Chao Yu
2025-03-26 3:24 ` [f2fs-dev] " Chao Yu via Linux-f2fs-devel
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=20250325125824.3367060-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.