On Thu, Apr 04, 2019 at 06:49:10PM -0500, Eric Sandeen wrote:
> On 3/20/19 2:37 PM, Darrick J. Wong wrote:
> > 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 | 13 ++++++++++++-
> > 1 file changed, 12 insertions(+), 1 deletion(-)
> >
> > diff --git a/db/metadump.c b/db/metadump.c
> > index 83a257d0..57216291 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,7 +2085,7 @@ process_bmbt_reclist(
> > }
> >
> > /* multi-extent blocks require special handling */
> > - if (btype != TYP_DIR2 || mp->m_dir_geo->fsbcount == 1) {
> > + if (!is_multi_fsb) {
> > error = process_single_fsb_objects(o, s, c, btype, last);
> > } else {
> > error = process_multi_fsb_objects(o, s, c, btype, last);
> >
>
> kind of a dumb nitpick, but "if not is" seems kind of backwards, perhaps
>
> 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);
> }
>
> is more natural?
Fewest changes necessary, but yes, I will rework that to be less awkward.
--D
