Hi Eric,
I read the previous comments from Dave about using defines for CRC offsets,
and with a grep search after applying this patch, looks there have another
two places maybe we should switch them to the macros as well:
fs/xfs/xfs_log.c:
Do we need a log record crc offset macros for offsetof(struct xlog_rec_header, h_crc))?
xfs_dinode.h:
we added the XFS_DINODE_CRC_OFF, just use it at below routine?
static inline uint xfs_dinode_size(int version)
{
if (version == 3)
return sizeof(struct xfs_dinode);
return offsetof(struct xfs_dinode, di_crc);
}
Thanks,
-Jeff
On 02/19 2014 07:52 AM, Eric Sandeen wrote:
> 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: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
> fs/xfs/xfs_ag.h | 6 ++++++
> fs/xfs/xfs_alloc.c | 10 ++++------
> fs/xfs/xfs_dinode.h | 2 ++
> fs/xfs/xfs_format.h | 2 ++
> fs/xfs/xfs_ialloc.c | 5 ++---
> fs/xfs/xfs_inode_buf.c | 4 ++--
> fs/xfs/xfs_sb.c | 5 ++---
> fs/xfs/xfs_sb.h | 2 ++
> fs/xfs/xfs_symlink_remote.c | 5 ++---
> 9 files changed, 24 insertions(+), 17 deletions(-)
>
> diff --git a/fs/xfs/xfs_ag.h b/fs/xfs/xfs_ag.h
> index 3fc1098..0fdd410 100644
> --- a/fs/xfs/xfs_ag.h
> +++ b/fs/xfs/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/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
> index 9eab2df..72ea855 100644
> --- a/fs/xfs/xfs_alloc.c
> +++ b/fs/xfs/xfs_alloc.c
> @@ -486,7 +486,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);
>
> @@ -516,8 +516,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 = {
> @@ -2242,7 +2241,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);
>
> @@ -2272,8 +2271,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/fs/xfs/xfs_dinode.h b/fs/xfs/xfs_dinode.h
> index e5869b5..623bbe8 100644
> --- a/fs/xfs/xfs_dinode.h
> +++ b/fs/xfs/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/fs/xfs/xfs_format.h b/fs/xfs/xfs_format.h
> index b6ab5a3..9898f31 100644
> --- a/fs/xfs/xfs_format.h
> +++ b/fs/xfs/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/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
> index 5d7f105..d79210b 100644
> --- a/fs/xfs/xfs_ialloc.c
> +++ b/fs/xfs/xfs_ialloc.c
> @@ -1572,7 +1572,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,
> @@ -1600,8 +1600,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/fs/xfs/xfs_inode_buf.c b/fs/xfs/xfs_inode_buf.c
> index 4fc9f39..606b43a 100644
> --- a/fs/xfs/xfs_inode_buf.c
> +++ b/fs/xfs/xfs_inode_buf.c
> @@ -306,7 +306,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) != ip->i_ino)
> return false;
> @@ -327,7 +327,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/fs/xfs/xfs_sb.c b/fs/xfs/xfs_sb.c
> index 1e11679..1ea7c86 100644
> --- a/fs/xfs/xfs_sb.c
> +++ b/fs/xfs/xfs_sb.c
> @@ -611,7 +611,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)) {
> @@ -674,8 +674,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/fs/xfs/xfs_sb.h b/fs/xfs/xfs_sb.h
> index 35061d4..f7b2fe7 100644
> --- a/fs/xfs/xfs_sb.h
> +++ b/fs/xfs/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/fs/xfs/xfs_symlink_remote.c b/fs/xfs/xfs_symlink_remote.c
> index bf59a2b..7a705a4 100644
> --- a/fs/xfs/xfs_symlink_remote.c
> +++ b/fs/xfs/xfs_symlink_remote.c
> @@ -134,7 +134,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);
> @@ -162,8 +162,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 = {
>
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
