* [PATCH] xfs: fix compiler warnings
@ 2017-08-31 22:28 Darrick J. Wong
2017-08-31 23:09 ` Dave Chinner
0 siblings, 1 reply; 3+ messages in thread
From: Darrick J. Wong @ 2017-08-31 22:28 UTC (permalink / raw)
To: xfs; +Cc: Brian Foster, Dave Chinner, Christoph Hellwig
Fix up all the compiler warnings about unused variables that have crept in.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/libxfs/xfs_inode_fork.c | 9 +++------
fs/xfs/xfs_buf_item.c | 4 ++++
fs/xfs/xfs_log_recover.c | 4 ++++
3 files changed, 11 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 f5d25f5..806b17e 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -570,12 +570,16 @@ xfs_buf_item_unlock(
bool aborted;
bool hold;
bool dirty;
+#ifdef DEBUG
bool ordered;
+#endif
aborted = !!(lip->li_flags & XFS_LI_ABORTED);
hold = !!(bip->bli_flags & XFS_BLI_HOLD);
dirty = !!(bip->bli_flags & XFS_BLI_DIRTY);
+#ifdef DEBUG
ordered = !!(bip->bli_flags & XFS_BLI_ORDERED);
+#endif
/* 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
while (lip != NULL) {
/*
* We're done when we see something other than an intent.
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] xfs: fix compiler warnings
2017-08-31 22:28 [PATCH] xfs: fix compiler warnings Darrick J. Wong
@ 2017-08-31 23:09 ` Dave Chinner
2017-08-31 23:37 ` Darrick J. Wong
0 siblings, 1 reply; 3+ messages in thread
From: Dave Chinner @ 2017-08-31 23:09 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: xfs, Brian Foster, Christoph Hellwig
On Thu, Aug 31, 2017 at 03:28:24PM -0700, Darrick J. Wong wrote:
> Fix up all the compiler warnings about unused variables that have crept in.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_inode_fork.c | 9 +++------
> fs/xfs/xfs_buf_item.c | 4 ++++
> fs/xfs/xfs_log_recover.c | 4 ++++
> 3 files changed, 11 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 f5d25f5..806b17e 100644
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
> @@ -570,12 +570,16 @@ xfs_buf_item_unlock(
> bool aborted;
> bool hold;
> bool dirty;
> +#ifdef DEBUG
> bool ordered;
> +#endif
>
> aborted = !!(lip->li_flags & XFS_LI_ABORTED);
> hold = !!(bip->bli_flags & XFS_BLI_HOLD);
> dirty = !!(bip->bli_flags & XFS_BLI_DIRTY);
> +#ifdef DEBUG
> ordered = !!(bip->bli_flags & XFS_BLI_ORDERED);
> +#endif
I'd revert the last patch that changed this code (because it's
busted!) and just do this here:
+#ifdef DEBUG
bool ordered = !!(bip->bli_flags & XFS_BLI_ORDERED);
+#endif
Also, feel free to rebase for-next to get rid of that last patch -
just like linux-next, for-next isn't meant to be 100% stable. IMO
it's better at this point to rebase for-next to remove/correct
mistakes than to have commits in the tree that don't work....
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] xfs: fix compiler warnings
2017-08-31 23:09 ` Dave Chinner
@ 2017-08-31 23:37 ` Darrick J. Wong
0 siblings, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2017-08-31 23:37 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs, Brian Foster, Christoph Hellwig
On Fri, Sep 01, 2017 at 09:09:46AM +1000, Dave Chinner wrote:
> On Thu, Aug 31, 2017 at 03:28:24PM -0700, Darrick J. Wong wrote:
> > Fix up all the compiler warnings about unused variables that have crept in.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > fs/xfs/libxfs/xfs_inode_fork.c | 9 +++------
> > fs/xfs/xfs_buf_item.c | 4 ++++
> > fs/xfs/xfs_log_recover.c | 4 ++++
> > 3 files changed, 11 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 f5d25f5..806b17e 100644
> > --- a/fs/xfs/xfs_buf_item.c
> > +++ b/fs/xfs/xfs_buf_item.c
> > @@ -570,12 +570,16 @@ xfs_buf_item_unlock(
> > bool aborted;
> > bool hold;
> > bool dirty;
> > +#ifdef DEBUG
> > bool ordered;
> > +#endif
> >
> > aborted = !!(lip->li_flags & XFS_LI_ABORTED);
> > hold = !!(bip->bli_flags & XFS_BLI_HOLD);
> > dirty = !!(bip->bli_flags & XFS_BLI_DIRTY);
> > +#ifdef DEBUG
> > ordered = !!(bip->bli_flags & XFS_BLI_ORDERED);
> > +#endif
>
> I'd revert the last patch that changed this code (because it's
> busted!) and just do this here:
>
> +#ifdef DEBUG
> bool ordered = !!(bip->bli_flags & XFS_BLI_ORDERED);
> +#endif
>
> Also, feel free to rebase for-next to get rid of that last patch -
> just like linux-next, for-next isn't meant to be 100% stable. IMO
> it's better at this point to rebase for-next to remove/correct
> mistakes than to have commits in the tree that don't work....
Ok. Sorry about the noise, everyone.
--D
>
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-31 23:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-31 22:28 [PATCH] xfs: fix compiler warnings Darrick J. Wong
2017-08-31 23:09 ` Dave Chinner
2017-08-31 23:37 ` Darrick J. Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox