diff options
| author | Fabian Frederick <fabf@skynet.be> | 2015-03-25 14:55:25 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-03-25 14:55:25 +1100 |
| commit | 29916df08db4726c92bdfe72ce524b4b6a9e3c54 (patch) | |
| tree | 0bc4863a2acba1afe299a2fbbcc33aa99813ea6a /fs/xfs | |
| parent | 86aaf02e57d25a3b4094ca76ff805ee2d7aa30f8 (diff) | |
| download | blackbird-op-linux-29916df08db4726c92bdfe72ce524b4b6a9e3c54.tar.gz blackbird-op-linux-29916df08db4726c92bdfe72ce524b4b6a9e3c54.zip | |
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: Fabian Frederick <fabf@skynet.be>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_da_btree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index 9cb0115c6bd1..2385f8cd08ab 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c @@ -538,12 +538,12 @@ xfs_da3_root_split( oldroot = blk1->bp->b_addr; if (oldroot->hdr.info.magic == cpu_to_be16(XFS_DA_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); - size = (int)((char *)&btree[nodehdr.count] - (char *)oldroot); - level = nodehdr.level; + size = (int)((char *)&btree[icnodehdr.count] - (char *)oldroot); + level = icnodehdr.level; /* * we are about to copy oldroot to bp, so set up the type |
