1 files changed, 15 insertions, 15 deletions
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index cb8132cb37ea..35561a511b57 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -168,7 +168,7 @@ error_cancel:
                                xfs_trans_cancel(tp, cancelflags);
                                goto error;
                        }
-                        memset(XFS_BUF_PTR(bp), 0, mp->m_sb.sb_blocksize);
+                        memset(bp->b_addr, 0, mp->m_sb.sb_blocksize);
                        xfs_trans_log_buf(tp, bp, 0, mp->m_sb.sb_blocksize - 1);
                        /*
                         * Commit the transaction.
@@ -943,7 +943,7 @@ xfs_rtcheck_range(
        if (error) {
                return error;
        }
-        bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+        bufp = bp->b_addr;
        /*
         * Compute the starting word's address, and starting bit.
         */
@@ -994,7 +994,7 @@ xfs_rtcheck_range(
                        if (error) {
                                return error;
                        }
-                        b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+                        b = bufp = bp->b_addr;
                        word = 0;
                } else {
                        /*
@@ -1040,7 +1040,7 @@ xfs_rtcheck_range(
                        if (error) {
                                return error;
                        }
-                        b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+                        b = bufp = bp->b_addr;
                        word = 0;
                } else {
                        /*
@@ -1158,7 +1158,7 @@ xfs_rtfind_back(
        if (error) {
                return error;
        }
-        bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+        bufp = bp->b_addr;
        /*
         * Get the first word's index & point to it.
         */
@@ -1210,7 +1210,7 @@ xfs_rtfind_back(
                        if (error) {
                                return error;
                        }
-                        bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+                        bufp = bp->b_addr;
                        word = XFS_BLOCKWMASK(mp);
                        b = &bufp[word];
                } else {
@@ -1256,7 +1256,7 @@ xfs_rtfind_back(
                        if (error) {
                                return error;
                        }
-                        bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+                        bufp = bp->b_addr;
                        word = XFS_BLOCKWMASK(mp);
                        b = &bufp[word];
                } else {
@@ -1333,7 +1333,7 @@ xfs_rtfind_forw(
        if (error) {
                return error;
        }
-        bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+        bufp = bp->b_addr;
        /*
         * Get the first word's index & point to it.
         */
@@ -1384,7 +1384,7 @@ xfs_rtfind_forw(
                        if (error) {
                                return error;
                        }
-                        b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+                        b = bufp = bp->b_addr;
                        word = 0;
                } else {
                        /*
@@ -1429,7 +1429,7 @@ xfs_rtfind_forw(
                        if (error) {
                                return error;
                        }
-                        b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+                        b = bufp = bp->b_addr;
                        word = 0;
                } else {
                        /*
@@ -1649,7 +1649,7 @@ xfs_rtmodify_range(
        if (error) {
                return error;
        }
-        bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+        bufp = bp->b_addr;
        /*
         * Compute the starting word's address, and starting bit.
         */
@@ -1694,7 +1694,7 @@ xfs_rtmodify_range(
                        if (error) {
                                return error;
                        }
-                        first = b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+                        first = b = bufp = bp->b_addr;
                        word = 0;
                } else {
                        /*
@@ -1734,7 +1734,7 @@ xfs_rtmodify_range(
                        if (error) {
                                return error;
                        }
-                        first = b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);
+                        first = b = bufp = bp->b_addr;
                        word = 0;
                } else {
                        /*
@@ -1832,8 +1832,8 @@ xfs_rtmodify_summary(
         */
        sp = XFS_SUMPTR(mp, bp, so);
        *sp += delta;
-        xfs_trans_log_buf(tp, bp, (uint)((char *)sp - (char *)XFS_BUF_PTR(bp)),
+        xfs_trans_log_buf(tp, bp, (uint)((char *)sp - (char *)bp->b_addr),
-                (uint)((char *)sp - (char *)XFS_BUF_PTR(bp) + sizeof(*sp) - 1));
+                (uint)((char *)sp - (char *)bp->b_addr + sizeof(*sp) - 1));
        return 0;
 }

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index cb8132cb37ea..35561a511b57 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c
@@ -168,7 +168,7 @@ error_cancel:
168	xfs_trans_cancel(tp, cancelflags);	168	xfs_trans_cancel(tp, cancelflags);
169	goto error;	169	goto error;
170	}	170	}
171	memset(XFS_BUF_PTR(bp), 0, mp->m_sb.sb_blocksize);	171	memset(bp->b_addr, 0, mp->m_sb.sb_blocksize);
172	xfs_trans_log_buf(tp, bp, 0, mp->m_sb.sb_blocksize - 1);	172	xfs_trans_log_buf(tp, bp, 0, mp->m_sb.sb_blocksize - 1);
173	/*	173	/*
174	* Commit the transaction.	174	* Commit the transaction.
@@ -943,7 +943,7 @@ xfs_rtcheck_range(
943	if (error) {	943	if (error) {
944	return error;	944	return error;
945	}	945	}
946	bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	946	bufp = bp->b_addr;
947	/*	947	/*
948	* Compute the starting word's address, and starting bit.	948	* Compute the starting word's address, and starting bit.
949	*/	949	*/
@@ -994,7 +994,7 @@ xfs_rtcheck_range(
994	if (error) {	994	if (error) {
995	return error;	995	return error;
996	}	996	}
997	b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	997	b = bufp = bp->b_addr;
998	word = 0;	998	word = 0;
999	} else {	999	} else {
1000	/*	1000	/*
@@ -1040,7 +1040,7 @@ xfs_rtcheck_range(
1040	if (error) {	1040	if (error) {
1041	return error;	1041	return error;
1042	}	1042	}
1043	b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1043	b = bufp = bp->b_addr;
1044	word = 0;	1044	word = 0;
1045	} else {	1045	} else {
1046	/*	1046	/*
@@ -1158,7 +1158,7 @@ xfs_rtfind_back(
1158	if (error) {	1158	if (error) {
1159	return error;	1159	return error;
1160	}	1160	}
1161	bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1161	bufp = bp->b_addr;
1162	/*	1162	/*
1163	* Get the first word's index & point to it.	1163	* Get the first word's index & point to it.
1164	*/	1164	*/
@@ -1210,7 +1210,7 @@ xfs_rtfind_back(
1210	if (error) {	1210	if (error) {
1211	return error;	1211	return error;
1212	}	1212	}
1213	bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1213	bufp = bp->b_addr;
1214	word = XFS_BLOCKWMASK(mp);	1214	word = XFS_BLOCKWMASK(mp);
1215	b = &bufp[word];	1215	b = &bufp[word];
1216	} else {	1216	} else {
@@ -1256,7 +1256,7 @@ xfs_rtfind_back(
1256	if (error) {	1256	if (error) {
1257	return error;	1257	return error;
1258	}	1258	}
1259	bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1259	bufp = bp->b_addr;
1260	word = XFS_BLOCKWMASK(mp);	1260	word = XFS_BLOCKWMASK(mp);
1261	b = &bufp[word];	1261	b = &bufp[word];
1262	} else {	1262	} else {
@@ -1333,7 +1333,7 @@ xfs_rtfind_forw(
1333	if (error) {	1333	if (error) {
1334	return error;	1334	return error;
1335	}	1335	}
1336	bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1336	bufp = bp->b_addr;
1337	/*	1337	/*
1338	* Get the first word's index & point to it.	1338	* Get the first word's index & point to it.
1339	*/	1339	*/
@@ -1384,7 +1384,7 @@ xfs_rtfind_forw(
1384	if (error) {	1384	if (error) {
1385	return error;	1385	return error;
1386	}	1386	}
1387	b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1387	b = bufp = bp->b_addr;
1388	word = 0;	1388	word = 0;
1389	} else {	1389	} else {
1390	/*	1390	/*
@@ -1429,7 +1429,7 @@ xfs_rtfind_forw(
1429	if (error) {	1429	if (error) {
1430	return error;	1430	return error;
1431	}	1431	}
1432	b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1432	b = bufp = bp->b_addr;
1433	word = 0;	1433	word = 0;
1434	} else {	1434	} else {
1435	/*	1435	/*
@@ -1649,7 +1649,7 @@ xfs_rtmodify_range(
1649	if (error) {	1649	if (error) {
1650	return error;	1650	return error;
1651	}	1651	}
1652	bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1652	bufp = bp->b_addr;
1653	/*	1653	/*
1654	* Compute the starting word's address, and starting bit.	1654	* Compute the starting word's address, and starting bit.
1655	*/	1655	*/
@@ -1694,7 +1694,7 @@ xfs_rtmodify_range(
1694	if (error) {	1694	if (error) {
1695	return error;	1695	return error;
1696	}	1696	}
1697	first = b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1697	first = b = bufp = bp->b_addr;
1698	word = 0;	1698	word = 0;
1699	} else {	1699	} else {
1700	/*	1700	/*
@@ -1734,7 +1734,7 @@ xfs_rtmodify_range(
1734	if (error) {	1734	if (error) {
1735	return error;	1735	return error;
1736	}	1736	}
1737	first = b = bufp = (xfs_rtword_t *)XFS_BUF_PTR(bp);	1737	first = b = bufp = bp->b_addr;
1738	word = 0;	1738	word = 0;
1739	} else {	1739	} else {
1740	/*	1740	/*
@@ -1832,8 +1832,8 @@ xfs_rtmodify_summary(
1832	*/	1832	*/
1833	sp = XFS_SUMPTR(mp, bp, so);	1833	sp = XFS_SUMPTR(mp, bp, so);
1834	*sp += delta;	1834	*sp += delta;
1835	xfs_trans_log_buf(tp, bp, (uint)((char )sp - (char )XFS_BUF_PTR(bp)),	1835	xfs_trans_log_buf(tp, bp, (uint)((char )sp - (char )bp->b_addr),
1836	(uint)((char )sp - (char )XFS_BUF_PTR(bp) + sizeof(*sp) - 1));	1836	(uint)((char )sp - (char )bp->b_addr + sizeof(*sp) - 1));
1837	return 0;	1837	return 0;
1838	}	1838	}
1839		1839