xfs: remove XFS_BUF_TO_SBP

Just dereference bp->b_addr directly and make the code a little
simpler and more clear.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c
index 5522dfcda104a8c4bbe7630904860ba2803507c8..9d84007a5c65ee803178954217fb23782fe4f96e 100644 (file)
--- a/fs/xfs/libxfs/xfs_ag.c
+++ b/fs/xfs/libxfs/xfs_ag.c
@@ -231,7 +231,7 @@ xfs_sbblock_init(
        struct xfs_buf          *bp,
        struct aghdr_init_data  *id)
 {
-       struct xfs_dsb          *dsb = XFS_BUF_TO_SBP(bp);
+       struct xfs_dsb          *dsb = bp->b_addr;
 
        xfs_sb_to_disk(dsb, &mp->m_sb);
        dsb->sb_inprogress = 1;

diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index f91a2c7b588aed38fa61522887ecfd15555b8948..cd814f99da28d05f9a0dfd95ca462e8a881d974b 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -560,7 +560,6 @@ xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino)
 
 #define XFS_SB_DADDR           ((xfs_daddr_t)0) /* daddr in filesystem/ag */
 #define        XFS_SB_BLOCK(mp)        XFS_HDR_BLOCK(mp, XFS_SB_DADDR)
-#define XFS_BUF_TO_SBP(bp)     ((xfs_dsb_t *)((bp)->b_addr))
 
 #define        XFS_HDR_BLOCK(mp,d)     ((xfs_agblock_t)XFS_BB_TO_FSBT(mp,d))
 #define        XFS_DADDR_TO_FSB(mp,d)  XFS_AGB_TO_FSB(mp, \

diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
index 2f60fc3c99a0fa378c3148f9fd883402a40510ac..00266de58954e2c769138d3e175d123494c345df 100644 (file)
--- a/fs/xfs/libxfs/xfs_sb.c
+++ b/fs/xfs/libxfs/xfs_sb.c
@@ -220,7 +220,7 @@ xfs_validate_sb_common(
        struct xfs_buf          *bp,
        struct xfs_sb           *sbp)
 {
-       struct xfs_dsb          *dsb = XFS_BUF_TO_SBP(bp);
+       struct xfs_dsb          *dsb = bp->b_addr;
        uint32_t                agcount = 0;
        uint32_t                rem;
 
@@ -681,7 +681,7 @@ xfs_sb_read_verify(
 {
        struct xfs_sb           sb;
        struct xfs_mount        *mp = bp->b_mount;
-       struct xfs_dsb          *dsb = XFS_BUF_TO_SBP(bp);
+       struct xfs_dsb          *dsb = bp->b_addr;
        int                     error;
 
        /*
@@ -707,7 +707,7 @@ xfs_sb_read_verify(
         * Check all the superblock fields.  Don't byteswap the xquota flags
         * because _verify_common checks the on-disk values.
         */
-       __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false);
+       __xfs_sb_from_disk(&sb, dsb, false);
        error = xfs_validate_sb_common(mp, bp, &sb);
        if (error)
                goto out_error;
@@ -730,7 +730,7 @@ static void
 xfs_sb_quiet_read_verify(
        struct xfs_buf  *bp)
 {
-       struct xfs_dsb  *dsb = XFS_BUF_TO_SBP(bp);
+       struct xfs_dsb  *dsb = bp->b_addr;
 
        if (dsb->sb_magicnum == cpu_to_be32(XFS_SB_MAGIC)) {
                /* XFS filesystem, verify noisily! */
@@ -748,13 +748,14 @@ xfs_sb_write_verify(
        struct xfs_sb           sb;
        struct xfs_mount        *mp = bp->b_mount;
        struct xfs_buf_log_item *bip = bp->b_log_item;
+       struct xfs_dsb          *dsb = bp->b_addr;
        int                     error;
 
        /*
         * Check all the superblock fields.  Don't byteswap the xquota flags
         * because _verify_common checks the on-disk values.
         */
-       __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false);
+       __xfs_sb_from_disk(&sb, dsb, false);
        error = xfs_validate_sb_common(mp, bp, &sb);
        if (error)
                goto out_error;
@@ -766,7 +767,7 @@ xfs_sb_write_verify(
                return;
 
        if (bip)
-               XFS_BUF_TO_SBP(bp)->sb_lsn = cpu_to_be64(bip->bli_item.li_lsn);
+               dsb->sb_lsn = cpu_to_be64(bip->bli_item.li_lsn);
 
        xfs_buf_update_cksum(bp, XFS_SB_CRC_OFF);
        return;
@@ -927,7 +928,7 @@ xfs_log_sb(
        mp->m_sb.sb_ifree = percpu_counter_sum(&mp->m_ifree);
        mp->m_sb.sb_fdblocks = percpu_counter_sum(&mp->m_fdblocks);
 
-       xfs_sb_to_disk(XFS_BUF_TO_SBP(bp), &mp->m_sb);
+       xfs_sb_to_disk(bp->b_addr, &mp->m_sb);
        xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SB_BUF);
        xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb) - 1);
 }
@@ -1007,7 +1008,7 @@ xfs_update_secondary_sbs(
                bp->b_ops = &xfs_sb_buf_ops;
                xfs_buf_oneshot(bp);
                xfs_buf_zero(bp, 0, BBTOB(bp->b_length));
-               xfs_sb_to_disk(XFS_BUF_TO_SBP(bp), &mp->m_sb);
+               xfs_sb_to_disk(bp->b_addr, &mp->m_sb);
                xfs_buf_delwri_queue(bp, &buffer_list);
                xfs_buf_relse(bp);
 

diff --git a/fs/xfs/scrub/agheader.c b/fs/xfs/scrub/agheader.c
index 163478855e7b5ebfeab4a246bcd7b447749f967e..e9bcf1faa183f93a99e8cfdaf88a612f259c8b37 100644 (file)
--- a/fs/xfs/scrub/agheader.c
+++ b/fs/xfs/scrub/agheader.c
@@ -92,7 +92,7 @@ xchk_superblock(
        if (!xchk_process_error(sc, agno, XFS_SB_BLOCK(mp), &error))
                return error;
 
-       sb = XFS_BUF_TO_SBP(bp);
+       sb = bp->b_addr;
 
        /*
         * Verify the geometries match.  Fields that are permanently

diff --git a/fs/xfs/scrub/agheader_repair.c b/fs/xfs/scrub/agheader_repair.c
index ce4adfa2b550b88cb1bc845384c7463139c21870..9b3954d7f7d92fe379eda0f48d04b4913fdaaf12 100644 (file)
--- a/fs/xfs/scrub/agheader_repair.c
+++ b/fs/xfs/scrub/agheader_repair.c
@@ -49,7 +49,7 @@ xrep_superblock(
 
        /* Copy AG 0's superblock to this one. */
        xfs_buf_zero(bp, 0, BBTOB(bp->b_length));
-       xfs_sb_to_disk(XFS_BUF_TO_SBP(bp), &mp->m_sb);
+       xfs_sb_to_disk(bp->b_addr, &mp->m_sb);
 
        /* Write this to disk. */
        xfs_trans_buf_set_type(sc->tp, bp, XFS_BLFT_SB_BUF);

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index b6cf99f7153f1c7b189b0ef2662e3494c992cdc4..6abc0863c9c3572fe0d6775215370ff97f95c3ac 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -5636,7 +5636,7 @@ xlog_do_recover(
 
        /* Convert superblock from on-disk format */
        sbp = &mp->m_sb;
-       xfs_sb_from_disk(sbp, XFS_BUF_TO_SBP(bp));
+       xfs_sb_from_disk(sbp, bp->b_addr);
        xfs_buf_relse(bp);
 
        /* re-initialise in-core superblock and geometry structures */

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 56efe140c923816b9233f7f9008024198dc7f9c5..c5513e5a226aca54ca88f3a06c5b43a3b8d8dbc2 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -310,7 +310,7 @@ reread:
        /*
         * Initialize the mount structure from the superblock.
         */
-       xfs_sb_from_disk(sbp, XFS_BUF_TO_SBP(bp));
+       xfs_sb_from_disk(sbp, bp->b_addr);
 
        /*
         * If we haven't validated the superblock, do so now before we try

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 3b208f9a865cb8275cb3230f31cb8f7f44328759..73c534093f09233318cf8712047533419c457e83 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -450,7 +450,7 @@ xfs_trans_apply_sb_deltas(
        int             whole = 0;
 
        bp = xfs_trans_getsb(tp, tp->t_mountp);
-       sbp = XFS_BUF_TO_SBP(bp);
+       sbp = bp->b_addr;
 
        /*
         * Check that superblock mods match the mods made to AGF counters.