[PATCH 23/21] xfs: fix endian issues reported by sparse

Dave Chinner
2013-03-13T00:29:20Z

From: Dave Chinner <dchinner@redhat.com>

Sparse reports several problems in the new code with incorrect
endian conversions being done on variables. Fix them.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_da_btree.c | 2 +-
fs/xfs/xfs_dinode.h | 2 +-
fs/xfs/xfs_dir2_block.c | 4 ++--
fs/xfs/xfs_dir2_data.c | 4 ++--
fs/xfs/xfs_dir2_leaf.c | 2 +-
fs/xfs/xfs_dir2_node.c | 6 +++---
fs/xfs/xfs_mount.c | 1 -
7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 10bfeaa..a78865e 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -2287,7 +2287,7 @@ xfs_da3_swap_lastblock(
goto done;
par_node = par_buf->b_addr;
xfs_da3_node_hdr_from_disk(&par_hdr, par_node);
- if (level >= 0 && level != be16_to_cpu(par_hdr.level) + 1) {
+ if (level >= 0 && level != par_hdr.level + 1) {
XFS_ERROR_REPORT("xfs_da_swap_lastblock(4)",
XFS_ERRLEVEL_LOW, mp);
error = XFS_ERROR(EFSCORRUPTED);
diff --git a/fs/xfs/xfs_dinode.h b/fs/xfs/xfs_dinode.h
index bdc946a..f7a0e95 100644
--- a/fs/xfs/xfs_dinode.h
+++ b/fs/xfs/xfs_dinode.h
@@ -72,7 +72,7 @@ typedef struct xfs_dinode {
__be32 di_next_unlinked;/* agi unlinked list ptr */

/* start of the extended dinode, writable fields */
- __be32 di_crc; /* CRC of the inode */
+ __le32 di_crc; /* CRC of the inode */
__be64 di_changecount; /* number of attribute changes */
__be64 di_lsn; /* flush sequence */
__be64 di_flags2; /* more random flags */
diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index 8c387e4..58816ec 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -67,14 +67,14 @@ xfs_dir3_block_verify(
struct xfs_dir3_blk_hdr *hdr3 = bp->b_addr;

if (xfs_sb_version_hascrc(&mp->m_sb)) {
- if (hdr3->magic != be32_to_cpu(XFS_DIR3_BLOCK_MAGIC))
+ if (hdr3->magic != cpu_to_be32(XFS_DIR3_BLOCK_MAGIC))
return false;
if (!uuid_equal(&hdr3->uuid, &mp->m_sb.sb_uuid))
return false;
if (be64_to_cpu(hdr3->blkno) != bp->b_bn)
return false;
} else {
- if (hdr3->magic != be32_to_cpu(XFS_DIR2_BLOCK_MAGIC))
+ if (hdr3->magic != cpu_to_be32(XFS_DIR2_BLOCK_MAGIC))
return false;
}
if (__xfs_dir3_data_check(NULL, bp))
diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/xfs_dir2_data.c
index 20a4aaf..5e0c711 100644
--- a/fs/xfs/xfs_dir2_data.c
+++ b/fs/xfs/xfs_dir2_data.c
@@ -200,14 +200,14 @@ xfs_dir3_data_verify(
struct xfs_dir3_blk_hdr *hdr3 = bp->b_addr;

if (xfs_sb_version_hascrc(&mp->m_sb)) {
- if (hdr3->magic != be32_to_cpu(XFS_DIR3_DATA_MAGIC))
+ if (hdr3->magic != cpu_to_be32(XFS_DIR3_DATA_MAGIC))
return false;
if (!uuid_equal(&hdr3->uuid, &mp->m_sb.sb_uuid))
return false;
if (be64_to_cpu(hdr3->blkno) != bp->b_bn)
return false;
} else {
- if (hdr3->magic != be32_to_cpu(XFS_DIR2_DATA_MAGIC))
+ if (hdr3->magic != cpu_to_be32(XFS_DIR2_DATA_MAGIC))
return false;
}
if (__xfs_dir3_data_check(NULL, bp))
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c
index 43a5c8543c4..9bf588c 100644
--- a/fs/xfs/xfs_dir2_leaf.c
+++ b/fs/xfs/xfs_dir2_leaf.c
@@ -180,7 +180,7 @@ xfs_dir3_leaf1_check(
static bool
xfs_dir3_leaf_verify(
struct xfs_buf *bp,
- __be16 magic)
+ __uint16_t magic)
{
struct xfs_mount *mp = bp->b_target->bt_mount;
struct xfs_dir2_leaf *leaf = bp->b_addr;
diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
index 7d1ee7d..9e542e7 100644
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -90,14 +90,14 @@ xfs_dir3_free_verify(
if (xfs_sb_version_hascrc(&mp->m_sb)) {
struct xfs_dir3_blk_hdr *hdr3 = bp->b_addr;

- if (hdr3->magic != be32_to_cpu(XFS_DIR3_FREE_MAGIC))
+ if (hdr3->magic != cpu_to_be32(XFS_DIR3_FREE_MAGIC))
return false;
if (!uuid_equal(&hdr3->uuid, &mp->m_sb.sb_uuid))
return false;
if (be64_to_cpu(hdr3->blkno) != bp->b_bn)
return false;
} else {
- if (hdr->magic != be32_to_cpu(XFS_DIR2_FREE_MAGIC))
+ if (hdr->magic != cpu_to_be32(XFS_DIR2_FREE_MAGIC))
return false;
}

@@ -1284,7 +1284,7 @@ xfs_dir2_leafn_remove(
{
struct xfs_dir3_icfree_hdr freehdr;
xfs_dir3_free_hdr_from_disk(&freehdr, free);
- ASSERT(be32_to_cpu(freehdr.firstdb) ==
+ ASSERT(freehdr.firstdb ==
xfs_dir3_free_max_bests(mp) *
(fdb - XFS_DIR2_FREE_FIRSTDB(mp)));
}
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 97443c9..cbef607 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -568,7 +568,6 @@ xfs_sb_from_disk(
to->sb_features_compat = be32_to_cpu(from->sb_features_compat);
to->sb_features_ro_compat = be32_to_cpu(from->sb_features_ro_compat);
to->sb_features_incompat = be32_to_cpu(from->sb_features_incompat);
- to->sb_crc = be32_to_cpu(from->sb_crc);
to->sb_pquotino = be64_to_cpu(from->sb_pquotino);
to->sb_lsn = be64_to_cpu(from->sb_lsn);
}