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 2/3] common/rc: move _check_f2fs_filesystem() to common/f2fs
Date: Thu, 9 Oct 2025 16:50:42 +0800 [thread overview]
Message-ID: <20251009085043.16910-2-chao@kernel.org> (raw)
In-Reply-To: <20251009085043.16910-1-chao@kernel.org>
_check_f2fs_filesystem() is f2fs specific, it's better to move it to
common/f2fs.
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Chao Yu <chao@kernel.org>
---
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
next prev parent reply other threads:[~2025-10-09 9:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-09 8:50 [PATCH 1/3] common/config: source common/f2fs in _source_specific_fs() Chao Yu
2025-10-09 8:50 ` Chao Yu [this message]
2025-10-17 16:21 ` [PATCH 2/3] common/rc: move _check_f2fs_filesystem() to common/f2fs Zorro Lang
2025-10-09 8:50 ` [PATCH 3/3] common/f2fs: introduce _require_inject_f2fs_command() Chao Yu
2025-10-17 16:50 ` Zorro Lang
2025-10-17 16:06 ` [PATCH 1/3] common/config: source common/f2fs in _source_specific_fs() Zorro Lang
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=20251009085043.16910-2-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