On Fri, Sep 01, 2017 at 12:29:58PM -0400, Brian Foster wrote:
> On Fri, Sep 01, 2017 at 09:19:18AM -0700, Darrick J. Wong wrote:
> > On Fri, Sep 01, 2017 at 06:26:23AM -0400, Brian Foster wrote:
> > > On Thu, Aug 31, 2017 at 04:38:33PM -0700, Darrick J. Wong wrote:
> > > > Fix up all the compiler warnings that have crept in.
> > > >
> > > > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> > > > ---
> > > > fs/xfs/libxfs/xfs_inode_fork.c | 9 +++------
> > > > fs/xfs/xfs_buf_item.c | 2 ++
> > > > fs/xfs/xfs_log_recover.c | 4 ++++
> > > > 3 files changed, 9 insertions(+), 6 deletions(-)
> > > >
> > > > diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
> > > > index fb310d0..31840ca 100644
> > > > --- a/fs/xfs/libxfs/xfs_inode_fork.c
> > > > +++ b/fs/xfs/libxfs/xfs_inode_fork.c
> > > > @@ -1499,14 +1499,11 @@ xfs_iext_realloc_indirect(
> > > > xfs_ifork_t *ifp, /* inode fork pointer */
> > > > int new_size) /* new indirection array size */
> > > > {
> > > > - int nlists; /* number of irec's (ex lists) */
> > > > - int size; /* current indirection array size */
> > > > -
> > > > ASSERT(ifp->if_flags & XFS_IFEXTIREC);
> > > > - nlists = ifp->if_real_bytes / XFS_IEXT_BUFSZ;
> > > > - size = nlists * sizeof(xfs_ext_irec_t);
> > > > ASSERT(ifp->if_real_bytes);
> > > > - ASSERT((new_size >= 0) && (new_size != size));
> > > > + ASSERT((new_size >= 0) &&
> > > > + (new_size != ((ifp->if_real_bytes / XFS_IEXT_BUFSZ) *
> > > > + sizeof(xfs_ext_irec_t))));
> > > > if (new_size == 0) {
> > > > xfs_iext_destroy(ifp);
> > > > } else {
> > > > diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> > > > index ef2c137..1a7814a 100644
> > > > --- a/fs/xfs/xfs_buf_item.c
> > > > +++ b/fs/xfs/xfs_buf_item.c
> > > > @@ -570,7 +570,9 @@ xfs_buf_item_unlock(
> > > > bool aborted = !!(lip->li_flags & XFS_LI_ABORTED);
> > > > bool hold = !!(bip->bli_flags & XFS_BLI_HOLD);
> > > > bool dirty = !!(bip->bli_flags & XFS_BLI_DIRTY);
> > > > +#ifdef DEBUG
> > > > bool ordered = !!(bip->bli_flags & XFS_BLI_ORDERED);
> > > > +#endif
> > > >
> > >
> > > This and the hunk below will break the CONFIG_XFS_WARN build.
> >
> > Oops, good catch.
> >
> > > Brian
> > >
> > > > /* Clear the buffer's association with this transaction. */
> > > > bp->b_transp = NULL;
> > > > diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> > > > index a362399..04a131c 100644
> > > > --- a/fs/xfs/xfs_log_recover.c
> > > > +++ b/fs/xfs/xfs_log_recover.c
> > > > @@ -4827,12 +4827,16 @@ xlog_recover_process_intents(
> > > > int error = 0;
> > > > struct xfs_ail_cursor cur;
> > > > struct xfs_ail *ailp;
> > > > +#ifdef DEBUG
> > > > xfs_lsn_t last_lsn;
> > > > +#endif
> > > >
> > > > ailp = log->l_ailp;
> > > > spin_lock(&ailp->xa_lock);
> > > > lip = xfs_trans_ail_cursor_first(ailp, &cur, 0);
> > > > +#ifdef DEBUG
> > > > last_lsn = xlog_assign_lsn(log->l_curr_cycle, log->l_curr_block);
> > > > +#endif
> >
> > This one ought to be fine, because the ASSERT is itself protected by an
> > '#ifdef DEBUG'.
> >
>
> That looks like a different assert from the one that uses last_lsn..?
Doh, you're right.
--D
>
> Brian
>
> > --D
> >
> > > > while (lip != NULL) {
> > > > /*
> > > > * We're done when we see something other than an intent.
> > > > --
> > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > > > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > > > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > > More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
