From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Pull the "is this a multi-fsb object" decision into a separate function
that we can keep close to the actual multi-fsb object dispatcher. We
will soon make the machinery more complex so we do this to avoid having
a big hairy if statement.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
db/metadump.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/db/metadump.c b/db/metadump.c
index 83a257d0..23ecf3b7 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -1979,6 +1979,16 @@ process_multi_fsb_dir(
return ret;
}
+static bool
+is_multi_fsb_object(
+ struct xfs_mount *mp,
+ typnm_t btype)
+{
+ if (btype == TYP_DIR2 && mp->m_dir_geo->fsbcount > 1)
+ return true;
+ return false;
+}
+
static int
process_multi_fsb_objects(
xfs_fileoff_t o,
@@ -2011,6 +2021,7 @@ process_bmbt_reclist(
xfs_fileoff_t last;
xfs_agnumber_t agno;
xfs_agblock_t agbno;
+ bool is_multi_fsb = is_multi_fsb_object(mp, btype);
int error;
if (btype == TYP_DATA)
@@ -2074,11 +2085,12 @@ process_bmbt_reclist(
}
/* multi-extent blocks require special handling */
- if (btype != TYP_DIR2 || mp->m_dir_geo->fsbcount == 1) {
- error = process_single_fsb_objects(o, s, c, btype, last);
- } else {
- error = process_multi_fsb_objects(o, s, c, btype, last);
- }
+ if (is_multi_fsb)
+ error = process_multi_fsb_objects(o, s, c, btype,
+ last);
+ else
+ error = process_single_fsb_objects(o, s, c, btype,
+ last);
if (error)
return 0;
}
