libxfs: Use defines for CRC offsets in all cases

[userspace port]

Some calls to crc functions used useful #defines,
others used awkward offsetof() constructs.

Switch them all to #define to make things a bit cleaner.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/include/xfs_ag.h b/include/xfs_ag.h
index 3fc109819c34eb7a42973d7640525fefe66cc08e..0fdd4109c62439b7471b46135a068148b1006d87 100644 (file)
--- a/include/xfs_ag.h
+++ b/include/xfs_ag.h
@@ -89,6 +89,8 @@ typedef struct xfs_agf {
        /* structure must be padded to 64 bit alignment */
 } xfs_agf_t;
 
+#define XFS_AGF_CRC_OFF                offsetof(struct xfs_agf, agf_crc)
+
 #define        XFS_AGF_MAGICNUM        0x00000001
 #define        XFS_AGF_VERSIONNUM      0x00000002
 #define        XFS_AGF_SEQNO           0x00000004
@@ -167,6 +169,8 @@ typedef struct xfs_agi {
        /* structure must be padded to 64 bit alignment */
 } xfs_agi_t;
 
+#define XFS_AGI_CRC_OFF                offsetof(struct xfs_agi, agi_crc)
+
 #define        XFS_AGI_MAGICNUM        0x00000001
 #define        XFS_AGI_VERSIONNUM      0x00000002
 #define        XFS_AGI_SEQNO           0x00000004
@@ -222,6 +226,8 @@ typedef struct xfs_agfl {
        __be32          agfl_bno[];     /* actually XFS_AGFL_SIZE(mp) */
 } xfs_agfl_t;
 
+#define XFS_AGFL_CRC_OFF       offsetof(struct xfs_agfl, agfl_crc)
+
 /*
  * tags for inode radix tree
  */

diff --git a/include/xfs_dinode.h b/include/xfs_dinode.h
index e5869b50dc41acd1788123e0cd49ea2670101e3f..623bbe8fd921d1fa8e3b994dabbf2014be5e7c6c 100644 (file)
--- a/include/xfs_dinode.h
+++ b/include/xfs_dinode.h
@@ -89,6 +89,8 @@ typedef struct xfs_dinode {
        /* structure must be padded to 64 bit alignment */
 } xfs_dinode_t;
 
+#define XFS_DINODE_CRC_OFF     offsetof(struct xfs_dinode, di_crc)
+
 #define DI_MAX_FLUSH 0xffff
 
 /*

diff --git a/include/xfs_format.h b/include/xfs_format.h
index 997c770c52e98406b10bb4acf8e54546e793bb9d..77f6b8ba205e0887ddda2d0c83e2e9fc81bd836b 100644 (file)
--- a/include/xfs_format.h
+++ b/include/xfs_format.h
@@ -145,6 +145,8 @@ struct xfs_dsymlink_hdr {
        __be64  sl_lsn;
 };
 
+#define XFS_SYMLINK_CRC_OFF    offsetof(struct xfs_dsymlink_hdr, sl_crc)
+
 /*
  * The maximum pathlen is 1024 bytes. Since the minimum file system
  * blocksize is 512 bytes, we can get a max of 3 extents back from

diff --git a/include/xfs_sb.h b/include/xfs_sb.h
index 35061d4b614c7ab9fabb80e1b93ffb6bc8b586d2..f7b2fe77c5a5bf095a8b01e793fda242c2968cc4 100644 (file)
--- a/include/xfs_sb.h
+++ b/include/xfs_sb.h
@@ -182,6 +182,8 @@ typedef struct xfs_sb {
        /* must be padded to 64 bit alignment */
 } xfs_sb_t;
 
+#define XFS_SB_CRC_OFF         offsetof(struct xfs_sb, sb_crc)
+
 /*
  * Superblock - on disk version.  Must match the in core version above.
  * Must be padded to 64 bit alignment.

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index e4fb1ada0242e13b95172f88bc339929b7c7cb34..8a6725e8809cd10628c20a2d1dc3fb4a22b9f7c3 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -464,7 +464,7 @@ xfs_agfl_read_verify(
                return;
 
        agfl_ok = xfs_verify_cksum(bp->b_addr, BBTOB(bp->b_length),
-                                  offsetof(struct xfs_agfl, agfl_crc));
+                                  XFS_AGFL_CRC_OFF);
 
        agfl_ok = agfl_ok && xfs_agfl_verify(bp);
 
@@ -494,8 +494,7 @@ xfs_agfl_write_verify(
        if (bip)
                XFS_BUF_TO_AGFL(bp)->agfl_lsn = cpu_to_be64(bip->bli_item.li_lsn);
 
-       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length),
-                        offsetof(struct xfs_agfl, agfl_crc));
+       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), XFS_AGFL_CRC_OFF);
 }
 
 const struct xfs_buf_ops xfs_agfl_buf_ops = {
@@ -2222,7 +2221,7 @@ xfs_agf_read_verify(
 
        if (xfs_sb_version_hascrc(&mp->m_sb))
                agf_ok = xfs_verify_cksum(bp->b_addr, BBTOB(bp->b_length),
-                                         offsetof(struct xfs_agf, agf_crc));
+                                         XFS_AGF_CRC_OFF);
 
        agf_ok = agf_ok && xfs_agf_verify(mp, bp);
 
@@ -2252,8 +2251,7 @@ xfs_agf_write_verify(
        if (bip)
                XFS_BUF_TO_AGF(bp)->agf_lsn = cpu_to_be64(bip->bli_item.li_lsn);
 
-       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length),
-                        offsetof(struct xfs_agf, agf_crc));
+       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), XFS_AGF_CRC_OFF);
 }
 
 const struct xfs_buf_ops xfs_agf_buf_ops = {

diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index afe1a824e2d56c4cd29b0613758563029ee808d6..b83ad98a6370ead6b1eb99d57e314c70945fc626 100644 (file)
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -1555,7 +1555,7 @@ xfs_agi_read_verify(
 
        if (xfs_sb_version_hascrc(&mp->m_sb))
                agi_ok = xfs_verify_cksum(bp->b_addr, BBTOB(bp->b_length),
-                                         offsetof(struct xfs_agi, agi_crc));
+                                         XFS_AGI_CRC_OFF);
        agi_ok = agi_ok && xfs_agi_verify(bp);
 
        if (unlikely(XFS_TEST_ERROR(!agi_ok, mp, XFS_ERRTAG_IALLOC_READ_AGI,
@@ -1583,8 +1583,7 @@ xfs_agi_write_verify(
 
        if (bip)
                XFS_BUF_TO_AGI(bp)->agi_lsn = cpu_to_be64(bip->bli_item.li_lsn);
-       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length),
-                        offsetof(struct xfs_agi, agi_crc));
+       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), XFS_AGI_CRC_OFF);
 }
 
 const struct xfs_buf_ops xfs_agi_buf_ops = {

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index d245d728ae84d5b92dbba4ca2cda256c9148c573..4f290331920418c38996a5e1b615ef0f610e19df 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -292,7 +292,7 @@ xfs_dinode_verify(
        if (!xfs_sb_version_hascrc(&mp->m_sb))
                return false;
        if (!xfs_verify_cksum((char *)dip, mp->m_sb.sb_inodesize,
-                             offsetof(struct xfs_dinode, di_crc)))
+                             XFS_DINODE_CRC_OFF))
                return false;
        if (be64_to_cpu(dip->di_ino) != ino)
                return false;
@@ -313,7 +313,7 @@ xfs_dinode_calc_crc(
 
        ASSERT(xfs_sb_version_hascrc(&mp->m_sb));
        crc = xfs_start_cksum((char *)dip, mp->m_sb.sb_inodesize,
-                             offsetof(struct xfs_dinode, di_crc));
+                             XFS_DINODE_CRC_OFF);
        dip->di_crc = xfs_end_cksum(crc);
 }
 

diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
index 05bc860b1f7aad4aa875b5452533bc93e0e5807e..bbcf886cdf35451ca40839a1151210dbfe705aef 100644 (file)
--- a/libxfs/xfs_sb.c
+++ b/libxfs/xfs_sb.c
@@ -566,7 +566,7 @@ xfs_sb_read_verify(
             dsb->sb_crc != 0)) {
 
                if (!xfs_verify_cksum(bp->b_addr, BBTOB(bp->b_length),
-                                     offsetof(struct xfs_sb, sb_crc))) {
+                                     XFS_SB_CRC_OFF)) {
                        /* Only fail bad secondaries on a known V5 filesystem */
                        if (bp->b_bn == XFS_SB_DADDR ||
                            xfs_sb_version_hascrc(&mp->m_sb)) {
@@ -629,8 +629,7 @@ xfs_sb_write_verify(
        if (bip)
                XFS_BUF_TO_SBP(bp)->sb_lsn = cpu_to_be64(bip->bli_item.li_lsn);
 
-       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length),
-                        offsetof(struct xfs_sb, sb_crc));
+       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), XFS_SB_CRC_OFF);
 }
 
 const struct xfs_buf_ops xfs_sb_buf_ops = {

diff --git a/libxfs/xfs_symlink_remote.c b/libxfs/xfs_symlink_remote.c
index 539db0cb90293f46863aee4a92f0a7b177602bdd..09ee9d43ee387ab7851236842c591addcfc681d2 100644 (file)
--- a/libxfs/xfs_symlink_remote.c
+++ b/libxfs/xfs_symlink_remote.c
@@ -117,7 +117,7 @@ xfs_symlink_read_verify(
                return;
 
        if (!xfs_verify_cksum(bp->b_addr, BBTOB(bp->b_length),
-                                 offsetof(struct xfs_dsymlink_hdr, sl_crc)) ||
+                                 XFS_SYMLINK_CRC_OFF) ||
            !xfs_symlink_verify(bp)) {
                XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, bp->b_addr);
                xfs_buf_ioerror(bp, EFSCORRUPTED);
@@ -145,8 +145,7 @@ xfs_symlink_write_verify(
                struct xfs_dsymlink_hdr *dsl = bp->b_addr;
                dsl->sl_lsn = cpu_to_be64(bip->bli_item.li_lsn);
        }
-       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length),
-                        offsetof(struct xfs_dsymlink_hdr, sl_crc));
+       xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), XFS_SYMLINK_CRC_OFF);
 }
 
 const struct xfs_buf_ops xfs_symlink_buf_ops = {