xfsprogs: minor endian annotation fixes

No actual bugs, just quiet the sparse checker.

Fixes sparse warnings about this.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 64761b3a03c7881bb3cdc8801b9e1171cdddd008..a6d670388f74bc2ce668d2ef39995325c9553e09 100644 (file)
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -505,7 +505,7 @@ sb_update_uuid(
         */
        if (xfs_sb_version_hascrc(sb) && !xfs_sb_version_hasmetauuid(sb) &&
            !uuid_equal(&tcarg->uuid, &sb->sb_uuid)) {
-               __be32 feat;
+               uint32_t feat;
 
                feat = be32_to_cpu(ag_hdr->xfs_sb->sb_features_incompat);
                feat |= XFS_SB_FEAT_INCOMPAT_META_UUID;

diff --git a/db/crc.c b/db/crc.c
index b6775bc7652a2969bcdaac0fa0ae5cc52725e414..b6612a514ea136774e952da6f5f904bd49122b6a 100644 (file)
--- a/db/crc.c
+++ b/db/crc.c
@@ -130,7 +130,7 @@ crc_f(
                flist_t         *sfl;
                int             bit_length;
                int             parentoffset;
-               int             crc;
+               uint32_t        crc;
 
                sfl = fl;
                parentoffset = 0;
@@ -144,8 +144,8 @@ crc_f(
                bit_length *= fcount(sfl->fld, iocur_top->data, parentoffset);
                crc = getbitval(iocur_top->data, sfl->offset, bit_length,
                                BVUNSIGNED);
-               /* Off by one.. */
-               crc = cpu_to_be32(crc + 1);
+               /* Off by one, ignore endianness - we're just corrupting it. */
+               crc++;
                setbitval(iocur_top->data, sfl->offset, bit_length, &crc);
 
                /* Temporarily remove write verifier to write a bad CRC */

diff --git a/db/write.c b/db/write.c
index a48576b9c0bd895f3089afba037df29c517290cc..e25d6ea873cbf34490dfa5f037a41cc4dd9bf479 100644 (file)
--- a/db/write.c
+++ b/db/write.c
@@ -525,7 +525,7 @@ convert_arg(
        char            *endp;
        char            *rbuf;
        char            *ostr;
-       __u64           *value;
+       __be64          *value;
        __u64           val = 0;
 
        if (bit_length <= 64)
@@ -535,7 +535,7 @@ convert_arg(
 
        buf = xrealloc(buf, alloc_size);
        memset(buf, 0, alloc_size);
-       value = (__u64 *)buf;
+       value = (__be64 *)buf;
        rbuf = buf;
 
        if (*arg == '\"') {

diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index e2889f0fc93ce2cc5f38eb159f685e671f141d12..e29366a141e4f5b7c1fd142ca63161bb598aa9c3 100644 (file)
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -467,6 +467,7 @@ xlog_print_dir2_sf(
        xfs_dir2_sf_hdr_t *sfp,
        int             size)
 {
+       __be64          pino;   /* parent inode nr */
        xfs_ino_t       ino;
        int             count;
        int             i;
@@ -481,8 +482,8 @@ xlog_print_dir2_sf(
 
        printf(_("SHORTFORM DIRECTORY size %d count %d\n"),
               size, sfp->count);
-       memmove(&ino, &(sfp->parent), sizeof(ino));
-       printf(_(".. ino 0x%llx\n"), (unsigned long long) be64_to_cpu(ino));
+       memmove(&pino, &(sfp->parent), sizeof(pino));
+       printf(_(".. ino 0x%llx\n"), (unsigned long long) be64_to_cpu(pino));
 
        count = sfp->count;
        sfep = xfs_dir2_sf_firstentry(sfp);

diff --git a/repair/rmap.c b/repair/rmap.c
index 6de4a10552cbb4b9e7ba32ddd62da8860534e9ad..ebb5a3ad5b555a9426175a1f3d86b0ac2a93315a 100644 (file)
--- a/repair/rmap.c
+++ b/repair/rmap.c
@@ -482,7 +482,8 @@ rmap_store_ag_btree_rec(
         */
        agfl_bno = XFS_BUF_TO_AGFL_BNO(mp, agflbp);
        b = agfl_bno + ag_rmaps[agno].ar_flcount;
-       while (*b != NULLAGBLOCK && b - agfl_bno < libxfs_agfl_size(mp)) {
+       while (*b != cpu_to_be32(NULLAGBLOCK) &&
+              b - agfl_bno < libxfs_agfl_size(mp)) {
                error = rmap_add_ag_rec(mp, agno, be32_to_cpu(*b), 1,
                                XFS_RMAP_OWN_AG);
                if (error)