Commit 29916df0 authored by Fabian Frederick's avatar Fabian Frederick Committed by Dave Chinner

xfs: fix shadow warning in xfs_da3_root_split()

Use icnodehdr for struct xfs_da3_icnode_hdr instead of nodehdr
(already declared above).
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 86aaf02e
...@@ -538,12 +538,12 @@ xfs_da3_root_split( ...@@ -538,12 +538,12 @@ xfs_da3_root_split(
oldroot = blk1->bp->b_addr; oldroot = blk1->bp->b_addr;
if (oldroot->hdr.info.magic == cpu_to_be16(XFS_DA_NODE_MAGIC) || if (oldroot->hdr.info.magic == cpu_to_be16(XFS_DA_NODE_MAGIC) ||
oldroot->hdr.info.magic == cpu_to_be16(XFS_DA3_NODE_MAGIC)) { oldroot->hdr.info.magic == cpu_to_be16(XFS_DA3_NODE_MAGIC)) {
struct xfs_da3_icnode_hdr nodehdr; struct xfs_da3_icnode_hdr icnodehdr;
dp->d_ops->node_hdr_from_disk(&nodehdr, oldroot); dp->d_ops->node_hdr_from_disk(&icnodehdr, oldroot);
btree = dp->d_ops->node_tree_p(oldroot); btree = dp->d_ops->node_tree_p(oldroot);
size = (int)((char *)&btree[nodehdr.count] - (char *)oldroot); size = (int)((char *)&btree[icnodehdr.count] - (char *)oldroot);
level = nodehdr.level; level = icnodehdr.level;
/* /*
* we are about to copy oldroot to bp, so set up the type * we are about to copy oldroot to bp, so set up the type
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment