Re: [PATCH 08/11] xfs: replace a few open-coded XFS_DQTYPE_REC_MASK uses

Dave Chinner
2020-07-17T01:18:30Z

On Thu, Jul 16, 2020 at 06:07:15PM -0700, Darrick J. Wong wrote:
> On Fri, Jul 17, 2020 at 10:02:42AM +1000, Dave Chinner wrote:
> > On Wed, Jul 15, 2020 at 11:46:10PM -0700, Darrick J. Wong wrote:
> > > From: Darrick J. Wong <darrick.wong@oracle.com>
> > >
> > > Fix a few places where we open-coded this mask constant.
> > >
> > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > > ---
> > > fs/xfs/xfs_dquot_item_recover.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > >
> > > diff --git a/fs/xfs/xfs_dquot_item_recover.c b/fs/xfs/xfs_dquot_item_recover.c
> > > index d7eb85c7d394..93178341569a 100644
> > > --- a/fs/xfs/xfs_dquot_item_recover.c
> > > +++ b/fs/xfs/xfs_dquot_item_recover.c
> > > @@ -39,7 +39,7 @@ xlog_recover_dquot_ra_pass2(
> > > if (item->ri_buf[1].i_len < sizeof(struct xfs_disk_dquot))
> > > return;
> > >
> > > - type = recddq->d_flags & (XFS_DQTYPE_USER | XFS_DQTYPE_PROJ | XFS_DQTYPE_GROUP);
> > > + type = recddq->d_flags & XFS_DQTYPE_REC_MASK;
> > > ASSERT(type);
> > > if (log->l_quotaoffs_flag & type)
> > > return;
> > > @@ -91,7 +91,7 @@ xlog_recover_dquot_commit_pass2(
> > > /*
> > > * This type of quotas was turned off, so ignore this record.
> > > */
> > > - type = recddq->d_flags & (XFS_DQTYPE_USER | XFS_DQTYPE_PROJ | XFS_DQTYPE_GROUP);
> > > + type = recddq->d_flags & XFS_DQTYPE_REC_MASK;
> >
> > Couldn't these both be converted to xfs_dquot_type(recddq)?
>
> xfs_dquot_type takes a pointer to a incore dquot, not a struct
> xfs_disk_dquot, so no.

Ah, right, I didn't notice the recddq type mismatch there. Ok, code
is fine.

Reviewed-by: Dave Chinner <dchinner@redhat.com>

--
Dave Chinner
david@fromorbit.com