On Wed, Sep 09, 2015 at 02:33:59PM -0500, Eric Sandeen wrote:
> The da_level_state structure contains an 'n' member
> when XR_DIR_TRACE is enabled, which is a) write only, and
> b) set by a macro which doesn't exist (XFS_BUF_TO_DA_INTNODE)
>
> Removing this structure member fixes compilation with
> XR_DIR_TRACE enabled, and also makes da_level_state identical
> to dir2_level_state, so the two can be combined later.
>
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> repair/attr_repair.c | 9 ---------
> 1 files changed, 0 insertions(+), 9 deletions(-)
>
> diff --git a/repair/attr_repair.c b/repair/attr_repair.c
> index debe9e8..d63bc87 100644
> --- a/repair/attr_repair.c
> +++ b/repair/attr_repair.c
> @@ -59,9 +59,6 @@ typedef unsigned char da_freemap_t;
> */
> typedef struct da_level_state {
> xfs_buf_t *bp; /* block bp */
> -#ifdef XR_DIR_TRACE
> - xfs_da_intnode_t *n; /* bp data */
> -#endif
> xfs_dablk_t bno; /* file block number */
> xfs_dahash_t hashval; /* last verified hashval */
> int index; /* current index in block */
> @@ -232,9 +229,6 @@ traverse_int_dablock(xfs_mount_t *mp,
> da_cursor->level[i].bp = bp;
> da_cursor->level[i].bno = bno;
> da_cursor->level[i].index = 0;
> -#ifdef XR_DIR_TRACE
> - da_cursor->level[i].n = XFS_BUF_TO_DA_INTNODE(bp);
> -#endif
>
> /*
> * set up new bno for next level down
> @@ -624,9 +618,6 @@ verify_da_path(xfs_mount_t *mp,
> cursor->level[this_level].bno = dabno;
> cursor->level[this_level].hashval =
> be32_to_cpu(btree[0].hashval);
> -#ifdef XR_DIR_TRACE
> - cursor->level[this_level].n = newnode;
> -#endif
> entry = cursor->level[this_level].index = 0;
>
> /*
> --
> 1.7.1
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
|