From: Darrick J. Wong <djwong@xxxxxxxxxx>
Move the error reporting for the FITRIM ioctl out of vfs.c and into
phase8.c. This makes it so that IO errors encountered during trim are
counted as runtime errors instead of being dropped silently.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
scrub/phase8.c | 12 +++++++++++-
scrub/vfs.c | 12 +++++++-----
scrub/vfs.h | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/scrub/phase8.c b/scrub/phase8.c
index 6ad948ff6bf..3e174e400ba 100644
--- a/scrub/phase8.c
+++ b/scrub/phase8.c
@@ -47,10 +47,20 @@ int
phase8_func(
struct scrub_ctx *ctx)
{
+ int error;
+
if (!fstrim_ok(ctx))
return 0;
- fstrim(ctx);
+ error = fstrim(ctx);
+ if (error == EOPNOTSUPP)
+ return 0;
+
+ if (error) {
+ str_liberror(ctx, error, _("fstrim"));
+ return error;
+ }
+
progress_add(1);
return 0;
}
diff --git a/scrub/vfs.c b/scrub/vfs.c
index e4d56d1d380..5366e005746 100644
--- a/scrub/vfs.c
+++ b/scrub/vfs.c
@@ -296,15 +296,17 @@ struct fstrim_range {
#endif
/* Call FITRIM to trim all the unused space in a filesystem. */
-void
+int
fstrim(
struct scrub_ctx *ctx)
{
struct fstrim_range range = {0};
- int error;
range.len = ULLONG_MAX;
- error = ioctl(ctx->mnt.fd, FITRIM, &range);
- if (error && errno != EOPNOTSUPP && errno != ENOTTY)
- perror(_("fstrim"));
+ if (ioctl(ctx->mnt.fd, FITRIM, &range) == 0)
+ return 0;
+ if (errno == EOPNOTSUPP || errno == ENOTTY)
+ return EOPNOTSUPP;
+
+ return errno;
}
diff --git a/scrub/vfs.h b/scrub/vfs.h
index f79b1997a5b..e512df647b4 100644
--- a/scrub/vfs.h
+++ b/scrub/vfs.h
@@ -24,6 +24,6 @@ typedef int (*scan_fs_tree_dirent_fn)(struct scrub_ctx *, const char *,
int scan_fs_tree(struct scrub_ctx *ctx, scan_fs_tree_dir_fn dir_fn,
scan_fs_tree_dirent_fn dirent_fn, void *arg);
-void fstrim(struct scrub_ctx *ctx);
+int fstrim(struct scrub_ctx *ctx);
#endif /* XFS_SCRUB_VFS_H_ */
