[PATCH 3/8] xfs_scrub: collapse trim_filesystem

Darrick J. Wong
2023-12-31T22:49:13Z

Collapse this two-line helper into the main function since it's trivial.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
scrub/phase8.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/scrub/phase8.c b/scrub/phase8.c
index 07726b5b869..e577260a93d 100644
--- a/scrub/phase8.c
+++ b/scrub/phase8.c
@@ -21,15 +21,6 @@

/* Phase 8: Trim filesystem. */

-/* Trim the unused areas of the filesystem if the caller asked us to. */
-static void
-trim_filesystem(
- struct scrub_ctx *ctx)
-{
- fstrim(ctx);
- progress_add(1);
-}
-
/* Trim the filesystem, if desired. */
int
phase8_func(
@@ -47,7 +38,8 @@ phase8_func(
return 0;

maybe_trim:
- trim_filesystem(ctx);
+ fstrim(ctx);
+ progress_add(1);
return 0;
}