Get rid of XFS_BUF_PTR() macro

[sandeen: I accept the explicit (char *) casting for clarity,
 but removed a few that weren't needed.]

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 5a603af6993e6fb1b0c89d125a5632a931b2fcaa..944faa3d5635c2dff828e36a9b0a08eb949f6205 100644 (file)
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -85,7 +85,6 @@ enum xfs_buf_flags_t {        /* b_flags bits */
 
 #define XFS_BUF_DADDR_NULL             ((xfs_daddr_t) (-1LL))
 
-#define XFS_BUF_PTR(bp)                        ((char *)(bp)->b_addr)
 #define xfs_buf_offset(bp, offset)     ((bp)->b_addr + (offset))
 #define XFS_BUF_ADDR(bp)               ((bp)->b_bn)
 #define XFS_BUF_SIZE(bp)               ((bp)->b_bcount)

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index e0553867af6d49e56673bc994903b40e48821a06..ba4fe693b40cf70aacbe8de3679ec633859dee2c 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -131,7 +131,7 @@ static char *next(
        struct xfs_buf  *buf = (struct xfs_buf *)private;
 
        if (buf &&
-           (XFS_BUF_COUNT(buf) < (int)(ptr - XFS_BUF_PTR(buf)) + offset))
+           (XFS_BUF_COUNT(buf) < (int)(ptr - (char *)buf->b_addr) + offset))
                abort();
 
        return ptr + offset;
@@ -192,7 +192,7 @@ libxfs_log_clear(
        ptr = dptr;
        if (btp) {
                bp = libxfs_getbufr(btp, start, len);
-               ptr = XFS_BUF_PTR(bp);
+               ptr = bp->b_addr;
        }
        libxfs_log_header(ptr, fs_uuid, version, sunit, fmt, lsn, tail_lsn,
                          next, bp);
@@ -240,7 +240,7 @@ libxfs_log_clear(
                ptr = dptr;
                if (btp) {
                        bp = libxfs_getbufr(btp, blk, len);
-                       ptr = XFS_BUF_PTR(bp);
+                       ptr = bp->b_addr;
                }
                /*
                 * Note: pass the full buffer length as the sunit to initialize
@@ -1014,7 +1014,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags)
 {
        int     fd;
        int     error = 0;
-       char    *buf;
+       void    *buf;
        int     i;
 
        fd = libxfs_device_to_fd(btp->dev);
@@ -1135,7 +1135,7 @@ libxfs_writebufr(xfs_buf_t *bp)
                                    LIBXFS_BBTOOFF64(bp->b_bn), bp->b_flags);
        } else {
                int     i;
-               char    *buf = bp->b_addr;
+               void    *buf = bp->b_addr;
 
                for (i = 0; i < bp->b_nmaps; i++) {
                        off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);

diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
index 9817f07a702b8f021025d4a52d6ec7dd69a0cb78..cd47313909b5d9529cc1e58dbcec76f93b5d3100 100644 (file)
--- a/logprint/log_print_all.c
+++ b/logprint/log_print_all.c
@@ -27,10 +27,10 @@ xlog_print_find_oldest(
        first_blk = 0;          /* read first block */
        bp = xlog_get_bp(log, 1);
        xlog_bread_noalign(log, 0, 1, bp);
-       first_half_cycle = xlog_get_cycle(XFS_BUF_PTR(bp));
+       first_half_cycle = xlog_get_cycle(bp->b_addr);
        *last_blk = log->l_logBBsize-1; /* read last block */
        xlog_bread_noalign(log, *last_blk, 1, bp);
-       last_half_cycle = xlog_get_cycle(XFS_BUF_PTR(bp));
+       last_half_cycle = xlog_get_cycle(bp->b_addr);
        ASSERT(last_half_cycle != 0);
 
        if (first_half_cycle == last_half_cycle) /* all cycle nos are same */

diff --git a/mkfs/proto.c b/mkfs/proto.c
index d52d8ddfdacdaaf6ef0b4cd9116f7f8b43c2b9a7..b59ac4cf498b4765f471ff0d3a6cfef344bd65d9 100644 (file)
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -263,9 +263,10 @@ newfile(
                d = XFS_FSB_TO_DADDR(mp, map.br_startblock);
                bp = libxfs_trans_get_buf(logit ? tp : 0, mp->m_dev, d,
                        nb << mp->m_blkbb_log, 0);
-               memmove(XFS_BUF_PTR(bp), buf, len);
+               memmove(bp->b_addr, buf, len);
                if (len < XFS_BUF_COUNT(bp))
-                       memset(XFS_BUF_PTR(bp) + len, 0, XFS_BUF_COUNT(bp) - len);
+                       memset((char *)bp->b_addr + len, 0,
+                              XFS_BUF_COUNT(bp) - len);
                if (logit)
                        libxfs_trans_log_buf(tp, bp, 0, XFS_BUF_COUNT(bp) - 1);
                else

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 7e5b4560ebb642b7f3f92cf982e2d4a39e133542..d26555351470fd8a90cd0e6436ce6ef4c352a3c3 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3254,7 +3254,7 @@ prepare_devices(
         */
        buf = libxfs_getbuf(mp->m_ddev_targp, (xi->dsize - whack_blks),
                            whack_blks);
-       memset(XFS_BUF_PTR(buf), 0, WHACK_SIZE);
+       memset(buf->b_addr, 0, WHACK_SIZE);
        libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
        libxfs_purgebuf(buf);
 
@@ -3265,15 +3265,15 @@ prepare_devices(
         * ext[2,3] and reiserfs (64k) - and hopefully all else.
         */
        buf = libxfs_getbuf(mp->m_ddev_targp, 0, whack_blks);
-       memset(XFS_BUF_PTR(buf), 0, WHACK_SIZE);
+       memset(buf->b_addr, 0, WHACK_SIZE);
        libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
        libxfs_purgebuf(buf);
 
        /* OK, now write the superblock... */
        buf = libxfs_getbuf(mp->m_ddev_targp, XFS_SB_DADDR, XFS_FSS_TO_BB(mp, 1));
        buf->b_ops = &xfs_sb_buf_ops;
-       memset(XFS_BUF_PTR(buf), 0, cfg->sectorsize);
-       libxfs_sb_to_disk((void *)XFS_BUF_PTR(buf), sbp);
+       memset(buf->b_addr, 0, cfg->sectorsize);
+       libxfs_sb_to_disk(buf->b_addr, sbp);
        libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
        libxfs_purgebuf(buf);
 
@@ -3293,7 +3293,7 @@ prepare_devices(
                buf = libxfs_getbuf(mp->m_rtdev_targp,
                                    XFS_FSB_TO_BB(mp, cfg->rtblocks - 1LL),
                                    BTOBB(cfg->blocksize));
-               memset(XFS_BUF_PTR(buf), 0, cfg->blocksize);
+               memset(buf->b_addr, 0, cfg->blocksize);
                libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
                libxfs_purgebuf(buf);
        }
@@ -3337,8 +3337,8 @@ initialise_ag_headers(
                        XFS_AG_DADDR(mp, agno, XFS_SB_DADDR),
                        XFS_FSS_TO_BB(mp, 1));
        buf->b_ops = &xfs_sb_buf_ops;
-       memset(XFS_BUF_PTR(buf), 0, cfg->sectorsize);
-       libxfs_sb_to_disk((void *)XFS_BUF_PTR(buf), sbp);
+       memset(buf->b_addr, 0, cfg->sectorsize);
+       libxfs_sb_to_disk(buf->b_addr, sbp);
        libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
 
        /*

diff --git a/repair/agheader.c b/repair/agheader.c
index 0bd4a255a00afec65f2aed2e4a5f193084753187..77e04f60e9be36f6c44c19f19c2a498c5a957081 100644 (file)
--- a/repair/agheader.c
+++ b/repair/agheader.c
@@ -278,8 +278,8 @@ secondary_sb_whack(
                        + sizeof(sb->sb_dirblklog);
 
        /* Check the buffer we read from disk for garbage outside size */
-       for (ip = XFS_BUF_PTR(sbuf) + size;
-            ip < XFS_BUF_PTR(sbuf) + mp->m_sb.sb_sectsize;
+       for (ip = (char *)sbuf->b_addr + size;
+            ip < (char *)sbuf->b_addr + mp->m_sb.sb_sectsize;
             ip++)  {
                if (*ip)  {
                        do_bzero = 1;
@@ -302,7 +302,7 @@ secondary_sb_whack(
                        memcpy(&tmpuuid, &sb->sb_meta_uuid, sizeof(uuid_t));
                        memset((void *)((intptr_t)sb + size), 0,
                                mp->m_sb.sb_sectsize - size);
-                       memset(XFS_BUF_PTR(sbuf) + size, 0,
+                       memset((char *)sbuf->b_addr + size, 0,
                                mp->m_sb.sb_sectsize - size);
                        /* Preserve meta_uuid so we don't fail uuid checks */
                        memcpy(&sb->sb_meta_uuid, &tmpuuid, sizeof(uuid_t));

diff --git a/repair/phase6.c b/repair/phase6.c
index caab629e44b7f9e6c55459f4289464cb60edce82..19ad54d3ed5324508ed3429f4dd5d0e0d2e72ab1 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -675,7 +675,7 @@ _("can't access block %" PRIu64 " (fsbno %" PRIu64 ") of realtime bitmap inode %
                        return(1);
                }
 
-               memmove(XFS_BUF_PTR(bp), bmp, mp->m_sb.sb_blocksize);
+               memmove(bp->b_addr, bmp, mp->m_sb.sb_blocksize);
 
                libxfs_trans_log_buf(tp, bp, 0, mp->m_sb.sb_blocksize - 1);
 
@@ -747,7 +747,7 @@ _("can't access block %" PRIu64 " (fsbno %" PRIu64 ") of realtime summary inode
                        return(1);
                }
 
-               memmove(XFS_BUF_PTR(bp), smp, mp->m_sb.sb_blocksize);
+               memmove(bp->b_addr, smp, mp->m_sb.sb_blocksize);
 
                libxfs_trans_log_buf(tp, bp, 0, mp->m_sb.sb_blocksize - 1);
 

diff --git a/repair/prefetch.c b/repair/prefetch.c
index 227092078af02b7c0a71a52ab087bd54e17b1459..210815f8245411cfa04f4064bdff935f5913e1c9 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -593,7 +593,7 @@ pf_batch_read(
                                size = XFS_BUF_SIZE(bplist[i]);
                                if (len < size)
                                        break;
-                               memcpy(XFS_BUF_PTR(bplist[i]), pbuf, size);
+                               memcpy(bplist[i]->b_addr, pbuf, size);
                                bplist[i]->b_flags |= (LIBXFS_B_UPTODATE |
                                                       LIBXFS_B_UNCHECKED);
                                len -= size;