From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Replace the moveon returns in the scrub ioctl wrapper functions
with a direct integer error return.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
scrub/phase2.c | 23 ++++++++-------
scrub/phase3.c | 38 +++++++++++++-----------
scrub/phase4.c | 8 +++--
scrub/phase5.c | 4 +--
scrub/phase7.c | 4 +--
scrub/scrub.c | 83 +++++++++++++++++++++++++++++------------------------
scrub/scrub.h | 26 ++++++++---------
scrub/xfs_scrub.h | 2 +
8 files changed, 101 insertions(+), 87 deletions(-)
diff --git a/scrub/phase2.c b/scrub/phase2.c
index d92b7e29..016d8ec5 100644
--- a/scrub/phase2.c
+++ b/scrub/phase2.c
@@ -32,6 +32,7 @@ xfs_scan_ag_metadata(
unsigned long long broken_secondaries;
bool moveon;
char descr[DESCR_BUFSZ];
+ int ret;
xfs_action_list_init(&alist);
xfs_action_list_init(&immediate_alist);
@@ -41,8 +42,8 @@ xfs_scan_ag_metadata(
* First we scrub and fix the AG headers, because we need
* them to work well enough to check the AG btrees.
*/
- moveon = xfs_scrub_ag_headers(ctx, agno, &alist);
- if (!moveon)
+ ret = xfs_scrub_ag_headers(ctx, agno, &alist);
+ if (ret)
goto err;
/* Repair header damage. */
@@ -51,8 +52,8 @@ xfs_scan_ag_metadata(
goto err;
/* Now scrub the AG btrees. */
- moveon = xfs_scrub_ag_metadata(ctx, agno, &alist);
- if (!moveon)
+ ret = xfs_scrub_ag_metadata(ctx, agno, &alist);
+ if (ret)
goto err;
/*
@@ -100,11 +101,11 @@ xfs_scan_fs_metadata(
struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx;
bool *pmoveon = arg;
struct xfs_action_list alist;
- bool moveon;
+ int ret;
xfs_action_list_init(&alist);
- moveon = xfs_scrub_fs_metadata(ctx, &alist);
- if (!moveon)
+ ret = xfs_scrub_fs_metadata(ctx, &alist);
+ if (ret)
*pmoveon = false;
xfs_action_list_defer(ctx, agno, &alist);
@@ -134,9 +135,11 @@ xfs_scan_metadata(
* anything else.
*/
xfs_action_list_init(&alist);
- moveon = xfs_scrub_primary_super(ctx, &alist);
- if (!moveon)
+ ret = xfs_scrub_primary_super(ctx, &alist);
+ if (ret) {
+ moveon = false;
goto out;
+ }
moveon = xfs_action_list_process_or_defer(ctx, 0, &alist);
if (!moveon)
goto out;
@@ -178,7 +181,7 @@ xfs_estimate_metadata_work(
unsigned int *nr_threads,
int *rshift)
{
- *items = xfs_scrub_estimate_ag_work(ctx);
+ *items = scrub_estimate_ag_work(ctx);
*nr_threads = scrub_nproc(ctx);
*rshift = 0;
return true;
diff --git a/scrub/phase3.c b/scrub/phase3.c
index 13601ed7..02a9a098 100644
--- a/scrub/phase3.c
+++ b/scrub/phase3.c
@@ -25,10 +25,10 @@
* ensure that the inode we're checking matches what the inode scan
* told us to look at.
*/
-static bool
-xfs_scrub_fd(
+static int
+scrub_fd(
struct scrub_ctx *ctx,
- bool (*fn)(struct scrub_ctx *ctx, uint64_t ino,
+ int (*fn)(struct scrub_ctx *ctx, uint64_t ino,
uint32_t gen, struct xfs_action_list *a),
struct xfs_bulkstat *bs,
struct xfs_action_list *alist)
@@ -85,8 +85,8 @@ xfs_scrub_inode(
}
/* Scrub the inode. */
- moveon = xfs_scrub_fd(ctx, xfs_scrub_inode_fields, bstat, &alist);
- if (!moveon)
+ error = scrub_fd(ctx, xfs_scrub_inode_fields, bstat, &alist);
+ if (error)
goto out;
moveon = xfs_action_list_process_or_defer(ctx, agno, &alist);
@@ -94,14 +94,14 @@ xfs_scrub_inode(
goto out;
/* Scrub all block mappings. */
- moveon = xfs_scrub_fd(ctx, xfs_scrub_data_fork, bstat, &alist);
- if (!moveon)
+ error = scrub_fd(ctx, xfs_scrub_data_fork, bstat, &alist);
+ if (error)
goto out;
- moveon = xfs_scrub_fd(ctx, xfs_scrub_attr_fork, bstat, &alist);
- if (!moveon)
+ error = scrub_fd(ctx, xfs_scrub_attr_fork, bstat, &alist);
+ if (error)
goto out;
- moveon = xfs_scrub_fd(ctx, xfs_scrub_cow_fork, bstat, &alist);
- if (!moveon)
+ error = scrub_fd(ctx, xfs_scrub_cow_fork, bstat, &alist);
+ if (error)
goto out;
moveon = xfs_action_list_process_or_defer(ctx, agno, &alist);
@@ -110,23 +110,23 @@ xfs_scrub_inode(
if (S_ISLNK(bstat->bs_mode)) {
/* Check symlink contents. */
- moveon = xfs_scrub_symlink(ctx, bstat->bs_ino, bstat->bs_gen,
+ error = xfs_scrub_symlink(ctx, bstat->bs_ino, bstat->bs_gen,
&alist);
} else if (S_ISDIR(bstat->bs_mode)) {
/* Check the directory entries. */
- moveon = xfs_scrub_fd(ctx, xfs_scrub_dir, bstat, &alist);
+ error = scrub_fd(ctx, xfs_scrub_dir, bstat, &alist);
}
- if (!moveon)
+ if (error)
goto out;
/* Check all the extended attributes. */
- moveon = xfs_scrub_fd(ctx, xfs_scrub_attr, bstat, &alist);
- if (!moveon)
+ error = scrub_fd(ctx, xfs_scrub_attr, bstat, &alist);
+ if (error)
goto out;
/* Check parent pointers. */
- moveon = xfs_scrub_fd(ctx, xfs_scrub_parent, bstat, &alist);
- if (!moveon)
+ error = scrub_fd(ctx, xfs_scrub_parent, bstat, &alist);
+ if (error)
goto out;
/* Try to repair the file while it's open. */
@@ -135,6 +135,8 @@ xfs_scrub_inode(
goto out;
out:
+ if (error)
+ moveon = false;
error = ptcounter_add(icount, 1);
if (error) {
str_liberror(ctx, error,
diff --git a/scrub/phase4.c b/scrub/phase4.c
index 07927036..c60012b7 100644
--- a/scrub/phase4.c
+++ b/scrub/phase4.c
@@ -112,9 +112,9 @@ xfs_process_action_items(
/* Fix everything that needs fixing. */
bool
xfs_repair_fs(
- struct scrub_ctx *ctx)
+ struct scrub_ctx *ctx)
{
- bool moveon;
+ int ret;
/*
* Check the summary counters early. Normally we do this during phase
@@ -122,8 +122,8 @@ xfs_repair_fs(
* counters, so counter repairs have to be put on the list now so that
* they get fixed before we stop retrying unfixed metadata repairs.
*/
- moveon = xfs_scrub_fs_summary(ctx, &ctx->action_lists[0]);
- if (!moveon)
+ ret = xfs_scrub_fs_summary(ctx, &ctx->action_lists[0]);
+ if (ret)
return false;
return xfs_process_action_items(ctx);
diff --git a/scrub/phase5.c b/scrub/phase5.c
index 763685fd..cb79752f 100644
--- a/scrub/phase5.c
+++ b/scrub/phase5.c
@@ -390,8 +390,8 @@ _("Filesystem has errors, skipping connectivity checks."));
return true;
}
- moveon = xfs_scrub_fs_label(ctx);
- if (!moveon)
+ ret = xfs_scrub_fs_label(ctx);
+ if (ret)
return false;
ret = scrub_scan_all_inodes(ctx, xfs_scrub_connections, &moveon);
diff --git a/scrub/phase7.c b/scrub/phase7.c
index 4314904f..b5f77b36 100644
--- a/scrub/phase7.c
+++ b/scrub/phase7.c
@@ -121,8 +121,8 @@ xfs_scan_summary(
/* Check and fix the fs summary counters. */
xfs_action_list_init(&alist);
- moveon = xfs_scrub_fs_summary(ctx, &alist);
- if (!moveon)
+ error = xfs_scrub_fs_summary(ctx, &alist);
+ if (error)
return false;
moveon = xfs_action_list_process(ctx, ctx->mnt.fd, &alist,
ALP_COMPLAIN_IF_UNFIXED | ALP_NOPROGRESS);
diff --git a/scrub/scrub.c b/scrub/scrub.c
index ed21ce0c..b6339578 100644
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -250,7 +250,7 @@ _("Optimizations of %s are possible."), _(xfrog_scrubbers[i].descr));
}
/* Save a scrub context for later repairs. */
-static bool
+static int
xfs_scrub_save_repair(
struct scrub_ctx *ctx,
struct xfs_action_list *alist,
@@ -261,9 +261,10 @@ xfs_scrub_save_repair(
/* Schedule this item for later repairs. */
aitem = malloc(sizeof(struct action_item));
if (!aitem) {
- str_errno(ctx, _("repair list"));
- return false;
+ str_errno(ctx, _("adding item to repair list"));
+ return errno;
}
+
memset(aitem, 0, sizeof(*aitem));
aitem->type = meta->sm_type;
aitem->flags = meta->sm_flags;
@@ -281,10 +282,14 @@ xfs_scrub_save_repair(
}
xfs_action_list_add(alist, aitem);
- return true;
+ return 0;
}
-/* Scrub non-inode metadata, saving corruption reports for later. */
+/*
+ * Scrub non-inode metadata, saving corruption reports for later. Returns 0
+ * for success. If errors occur, this function will log them and return a
+ * positive error code.
+ */
static int
xfs_scrub_meta(
struct scrub_ctx *ctx,
@@ -297,6 +302,7 @@ xfs_scrub_meta(
.sm_agno = agno,
};
enum check_outcome fix;
+ int ret;
background_sleep();
@@ -308,8 +314,9 @@ xfs_scrub_meta(
case CHECK_ABORT:
return ECANCELED;
case CHECK_REPAIR:
- if (!xfs_scrub_save_repair(ctx, alist, &meta))
- return ENOMEM;
+ ret = xfs_scrub_save_repair(ctx, alist, &meta);
+ if (ret)
+ return ret;
/* fall through */
case CHECK_DONE:
return 0;
@@ -341,30 +348,28 @@ xfs_scrub_meta_type(
ret = xfs_scrub_meta(ctx, type, agno, alist);
if (ret)
- return false;
+ return ret;
}
- return true;
+ return 0;
}
/*
* Scrub primary superblock. This will be useful if we ever need to hook
* a filesystem-wide pre-scrub activity off of the sb 0 scrubber (which
- * currently does nothing).
+ * currently does nothing). If errors occur, this function will log them and
+ * return nonzero.
*/
-bool
+int
xfs_scrub_primary_super(
struct scrub_ctx *ctx,
struct xfs_action_list *alist)
{
- int ret;
-
- ret = xfs_scrub_meta(ctx, XFS_SCRUB_TYPE_SB, 0, alist);
- return ret == 0;
+ return xfs_scrub_meta(ctx, XFS_SCRUB_TYPE_SB, 0, alist);
}
/* Scrub each AG's header blocks. */
-bool
+int
xfs_scrub_ag_headers(
struct scrub_ctx *ctx,
xfs_agnumber_t agno,
@@ -374,7 +379,7 @@ xfs_scrub_ag_headers(
}
/* Scrub each AG's metadata btrees. */
-bool
+int
xfs_scrub_ag_metadata(
struct scrub_ctx *ctx,
xfs_agnumber_t agno,
@@ -384,7 +389,7 @@ xfs_scrub_ag_metadata(
}
/* Scrub whole-FS metadata btrees. */
-bool
+int
xfs_scrub_fs_metadata(
struct scrub_ctx *ctx,
struct xfs_action_list *alist)
@@ -393,20 +398,17 @@ xfs_scrub_fs_metadata(
}
/* Scrub FS summary metadata. */
-bool
+int
xfs_scrub_fs_summary(
struct scrub_ctx *ctx,
struct xfs_action_list *alist)
{
- int ret;
-
- ret = xfs_scrub_meta(ctx, XFS_SCRUB_TYPE_FSCOUNTERS, 0, alist);
- return ret == 0;
+ return xfs_scrub_meta(ctx, XFS_SCRUB_TYPE_FSCOUNTERS, 0, alist);
}
/* How many items do we have to check? */
unsigned int
-xfs_scrub_estimate_ag_work(
+scrub_estimate_ag_work(
struct scrub_ctx *ctx)
{
const struct xfrog_scrub_descr *sc;
@@ -430,8 +432,11 @@ xfs_scrub_estimate_ag_work(
return estimate;
}
-/* Scrub inode metadata. */
-static bool
+/*
+ * Scrub inode metadata. If errors occur, this function will log them and
+ * return nonzero.
+ */
+static int
__xfs_scrub_file(
struct scrub_ctx *ctx,
uint64_t ino,
@@ -452,14 +457,14 @@ __xfs_scrub_file(
/* Scrub the piece of metadata. */
fix = xfs_check_metadata(ctx, &meta, true);
if (fix == CHECK_ABORT)
- return false;
+ return ECANCELED;
if (fix == CHECK_DONE)
- return true;
+ return 0;
return xfs_scrub_save_repair(ctx, alist, &meta);
}
-bool
+int
xfs_scrub_inode_fields(
struct scrub_ctx *ctx,
uint64_t ino,
@@ -469,7 +474,7 @@ xfs_scrub_inode_fields(
return __xfs_scrub_file(ctx, ino, gen, XFS_SCRUB_TYPE_INODE, alist);
}
-bool
+int
xfs_scrub_data_fork(
struct scrub_ctx *ctx,
uint64_t ino,
@@ -479,7 +484,7 @@ xfs_scrub_data_fork(
return __xfs_scrub_file(ctx, ino, gen, XFS_SCRUB_TYPE_BMBTD, alist);
}
-bool
+int
xfs_scrub_attr_fork(
struct scrub_ctx *ctx,
uint64_t ino,
@@ -489,7 +494,7 @@ xfs_scrub_attr_fork(
return __xfs_scrub_file(ctx, ino, gen, XFS_SCRUB_TYPE_BMBTA, alist);
}
-bool
+int
xfs_scrub_cow_fork(
struct scrub_ctx *ctx,
uint64_t ino,
@@ -499,7 +504,7 @@ xfs_scrub_cow_fork(
return __xfs_scrub_file(ctx, ino, gen, XFS_SCRUB_TYPE_BMBTC, alist);
}
-bool
+int
xfs_scrub_dir(
struct scrub_ctx *ctx,
uint64_t ino,
@@ -509,7 +514,7 @@ xfs_scrub_dir(
return __xfs_scrub_file(ctx, ino, gen, XFS_SCRUB_TYPE_DIR, alist);
}
-bool
+int
xfs_scrub_attr(
struct scrub_ctx *ctx,
uint64_t ino,
@@ -519,7 +524,7 @@ xfs_scrub_attr(
return __xfs_scrub_file(ctx, ino, gen, XFS_SCRUB_TYPE_XATTR, alist);
}
-bool
+int
xfs_scrub_symlink(
struct scrub_ctx *ctx,
uint64_t ino,
@@ -529,7 +534,7 @@ xfs_scrub_symlink(
return __xfs_scrub_file(ctx, ino, gen, XFS_SCRUB_TYPE_SYMLINK, alist);
}
-bool
+int
xfs_scrub_parent(
struct scrub_ctx *ctx,
uint64_t ino,
@@ -539,7 +544,11 @@ xfs_scrub_parent(
return __xfs_scrub_file(ctx, ino, gen, XFS_SCRUB_TYPE_PARENT, alist);
}
-/* Test the availability of a kernel scrub command. */
+/*
+ * Test the availability of a kernel scrub command. If errors occur (or the
+ * scrub ioctl is rejected) the errors will be logged and this function will
+ * return false.
+ */
static bool
__xfs_scrub_test(
struct scrub_ctx *ctx,
diff --git a/scrub/scrub.h b/scrub/scrub.h
index d407abb0..bfb3f8e3 100644
--- a/scrub/scrub.h
+++ b/scrub/scrub.h
@@ -17,15 +17,15 @@ enum check_outcome {
struct action_item;
void xfs_scrub_report_preen_triggers(struct scrub_ctx *ctx);
-bool xfs_scrub_primary_super(struct scrub_ctx *ctx,
+int xfs_scrub_primary_super(struct scrub_ctx *ctx,
struct xfs_action_list *alist);
-bool xfs_scrub_ag_headers(struct scrub_ctx *ctx, xfs_agnumber_t agno,
+int xfs_scrub_ag_headers(struct scrub_ctx *ctx, xfs_agnumber_t agno,
struct xfs_action_list *alist);
-bool xfs_scrub_ag_metadata(struct scrub_ctx *ctx, xfs_agnumber_t agno,
+int xfs_scrub_ag_metadata(struct scrub_ctx *ctx, xfs_agnumber_t agno,
struct xfs_action_list *alist);
-bool xfs_scrub_fs_metadata(struct scrub_ctx *ctx,
+int xfs_scrub_fs_metadata(struct scrub_ctx *ctx,
struct xfs_action_list *alist);
-bool xfs_scrub_fs_summary(struct scrub_ctx *ctx,
+int xfs_scrub_fs_summary(struct scrub_ctx *ctx,
struct xfs_action_list *alist);
bool xfs_can_scrub_fs_metadata(struct scrub_ctx *ctx);
@@ -37,21 +37,21 @@ bool xfs_can_scrub_symlink(struct scrub_ctx *ctx);
bool xfs_can_scrub_parent(struct scrub_ctx *ctx);
bool xfs_can_repair(struct scrub_ctx *ctx);
-bool xfs_scrub_inode_fields(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
+int xfs_scrub_inode_fields(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
struct xfs_action_list *alist);
-bool xfs_scrub_data_fork(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
+int xfs_scrub_data_fork(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
struct xfs_action_list *alist);
-bool xfs_scrub_attr_fork(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
+int xfs_scrub_attr_fork(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
struct xfs_action_list *alist);
-bool xfs_scrub_cow_fork(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
+int xfs_scrub_cow_fork(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
struct xfs_action_list *alist);
-bool xfs_scrub_dir(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
+int xfs_scrub_dir(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
struct xfs_action_list *alist);
-bool xfs_scrub_attr(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
+int xfs_scrub_attr(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
struct xfs_action_list *alist);
-bool xfs_scrub_symlink(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
+int xfs_scrub_symlink(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
struct xfs_action_list *alist);
-bool xfs_scrub_parent(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
+int xfs_scrub_parent(struct scrub_ctx *ctx, uint64_t ino, uint32_t gen,
struct xfs_action_list *alist);
/* Repair parameters are the scrub inputs and retry count. */
diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h
index 6558bad7..4353756c 100644
--- a/scrub/xfs_scrub.h
+++ b/scrub/xfs_scrub.h
@@ -99,7 +99,7 @@ bool xfs_repair_fs(struct scrub_ctx *ctx);
/* Progress estimator functions */
uint64_t xfs_estimate_inodes(struct scrub_ctx *ctx);
-unsigned int xfs_scrub_estimate_ag_work(struct scrub_ctx *ctx);
+unsigned int scrub_estimate_ag_work(struct scrub_ctx *ctx);
bool xfs_estimate_metadata_work(struct scrub_ctx *ctx, uint64_t *items,
unsigned int *nr_threads, int *rshift);
bool xfs_estimate_inodes_work(struct scrub_ctx *ctx, uint64_t *items,
