From: Brian Foster <bfoster@redhat.com>
To: Dave Chinner <david@fromorbit.com>
Cc: bvowk@box.com, xfs@oss.sgi.com
Subject: Re: [PATCH 1/2] repair: fix XR_BLD_FREE_TRACE compilation errors
Date: Wed, 29 Oct 2014 15:24:53 -0400 [thread overview]
Message-ID: <20141029192453.GA2084@bfoster.laptop> (raw)
In-Reply-To: <1414552144-12627-2-git-send-email-david@fromorbit.com>
On Wed, Oct 29, 2014 at 02:09:03PM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Obviously hasn't been used for quite some time, so fix the
> build problems and make it useful again.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> repair/phase5.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/repair/phase5.c b/repair/phase5.c
> index e82eeb7..d6d3c6d 100644
> --- a/repair/phase5.c
> +++ b/repair/phase5.c
> @@ -362,10 +362,6 @@ calculate_freespace_cursor(xfs_mount_t *mp, xfs_agnumber_t agno,
> extent_tree_node_t *ext_ptr;
> int level;
> #ifdef XR_BLD_FREE_TRACE
> - int old_state;
> - int state = XR_E_BAD_STATE;
> -#endif
> -#ifdef XR_BLD_FREE_TRACE
> fprintf(stderr,
> "in init_freespace_cursor, agno = %d\n", agno);
> #endif
> @@ -1292,8 +1288,8 @@ build_agf_agfl(xfs_mount_t *mp,
> memset(agf, 0, mp->m_sb.sb_sectsize);
>
> #ifdef XR_BLD_FREE_TRACE
> - fprintf(stderr, "agf = 0x%x, agf_buf->b_un.b_addr = 0x%x\n",
> - (__psint_t) agf, (__psint_t) agf_buf->b_un.b_addr);
> + fprintf(stderr, "agf = 0x%p, agf_buf->b_addr = 0x%p\n",
> + agf, agf_buf->b_addr);
> #endif
>
> /*
> @@ -1452,7 +1448,7 @@ build_agf_agfl(xfs_mount_t *mp,
> }
>
> #ifdef XR_BLD_FREE_TRACE
> - fprintf(stderr, "wrote agf for ag %u, error = %d\n", agno, error);
> + fprintf(stderr, "wrote agf for ag %u\n", agno);
> #endif
> }
>
> @@ -1707,11 +1703,10 @@ phase5(xfs_mount_t *mp)
> #ifdef XR_BLD_FREE_TRACE
> fprintf(stderr, "inobt level 1, maxrec = %d, minrec = %d\n",
> xfs_inobt_maxrecs(mp, mp->m_sb.sb_blocksize, 0),
> - xfs_inobt_maxrecs(mp->m_sb.sb_blocksize, 0) / 2
> - );
> + xfs_inobt_maxrecs(mp, mp->m_sb.sb_blocksize, 0) / 2);
> fprintf(stderr, "inobt level 0 (leaf), maxrec = %d, minrec = %d\n",
> - xfs_inobt_maxrecs(mp, mp->m_sb.sb_blocksize, xfs_inobt, 1),
> - xfs_inobt_maxrecs(mp, mp->m_sb.sb_blocksize, xfs_inobt, 1) / 2);
> + xfs_inobt_maxrecs(mp, mp->m_sb.sb_blocksize, 1),
> + xfs_inobt_maxrecs(mp, mp->m_sb.sb_blocksize, 1) / 2);
> fprintf(stderr, "xr inobt level 0 (leaf), maxrec = %d\n",
> XR_INOBT_BLOCK_MAXRECS(mp, 0));
> fprintf(stderr, "xr inobt level 1 (int), maxrec = %d\n",
> --
> 2.0.0
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2014-10-29 19:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-29 3:09 [PATCH 0/2] repair: fix AGFL rebuild problem Dave Chinner
2014-10-29 3:09 ` [PATCH 1/2] repair: fix XR_BLD_FREE_TRACE compilation errors Dave Chinner
2014-10-29 4:03 ` Eric Sandeen
2014-10-29 19:24 ` Brian Foster [this message]
2014-10-29 3:09 ` [PATCH 2/2] repair: AGFL rebuild fails if btree split required Dave Chinner
2014-10-29 19:26 ` Brian Foster
2014-10-29 19:59 ` Dave Chinner
2014-10-30 13:42 ` Brian Foster
2014-10-29 18:23 ` [PATCH 0/2] repair: fix AGFL rebuild problem Barkley Vowk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141029192453.GA2084@bfoster.laptop \
--to=bfoster@redhat.com \
--cc=bvowk@box.com \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox