mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

xfs: remove XFS_BLOCKWSIZE and XFS_BLOCKWMASK macros

Browse source 
Remove these trivial macros since they're not even part of the ondisk
format.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2023-10-16 09:46:08 -07:00
parent 90d98a6ada
commit add3cddaea
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/xfs/libxfs/xfs_format.h
View file

@ -1142,8 +1142,6 @@ static inline bool xfs_dinode_has_large_extent_counts(
#define XFS_BLOCKSIZE(mp) ((mp)->m_sb.sb_blocksize)
#define XFS_BLOCKMASK(mp) ((mp)->m_blockmask)
#define XFS_BLOCKWSIZE(mp) ((mp)->m_blockwsize)
#define XFS_BLOCKWMASK(mp) ((mp)->m_blockwmask)
/*
* RT Summary and bit manipulation macros.

16
fs/xfs/libxfs/xfs_rtbitmap.c
View file

@ -174,7 +174,7 @@ xfs_rtfind_back(
return error;
}
bufp = bp->b_addr;
word = XFS_BLOCKWMASK(mp);
word = mp->m_blockwsize - 1;
b = &bufp[word];
} else {
/*
@ -220,7 +220,7 @@ xfs_rtfind_back(
return error;
}
bufp = bp->b_addr;
word = XFS_BLOCKWMASK(mp);
word = mp->m_blockwsize - 1;
b = &bufp[word];
} else {
/*
@ -338,7 +338,7 @@ xfs_rtfind_forw(
* Go on to next block if that's where the next word is
* and we need the next word.
*/
if (++word == XFS_BLOCKWSIZE(mp) && i < len) {
if (++word == mp->m_blockwsize && i < len) {
/*
* If done with this block, get the previous one.
*/
@ -383,7 +383,7 @@ xfs_rtfind_forw(
* Go on to next block if that's where the next word is
* and we need the next word.
*/
if (++word == XFS_BLOCKWSIZE(mp) && i < len) {
if (++word == mp->m_blockwsize && i < len) {
/*
* If done with this block, get the next one.
*/
@ -593,7 +593,7 @@ xfs_rtmodify_range(
* Go on to the next block if that's where the next word is
* and we need the next word.
*/
if (++word == XFS_BLOCKWSIZE(mp) && i < len) {
if (++word == mp->m_blockwsize && i < len) {
/*
* Log the changed part of this block.
* Get the next one.
@ -633,7 +633,7 @@ xfs_rtmodify_range(
* Go on to the next block if that's where the next word is
* and we need the next word.
*/
if (++word == XFS_BLOCKWSIZE(mp) && i < len) {
if (++word == mp->m_blockwsize && i < len) {
/*
* Log the changed part of this block.
* Get the next one.
@ -836,7 +836,7 @@ xfs_rtcheck_range(
* Go on to next block if that's where the next word is
* and we need the next word.
*/
if (++word == XFS_BLOCKWSIZE(mp) && i < len) {
if (++word == mp->m_blockwsize && i < len) {
/*
* If done with this block, get the next one.
*/
@ -882,7 +882,7 @@ xfs_rtcheck_range(
* Go on to next block if that's where the next word is
* and we need the next word.
*/
if (++word == XFS_BLOCKWSIZE(mp) && i < len) {
if (++word == mp->m_blockwsize && i < len) {
/*
* If done with this block, get the next one.
*/

2
fs/xfs/libxfs/xfs_rtbitmap.h
View file

@ -146,7 +146,7 @@ xfs_rtx_to_rbmword(
struct xfs_mount *mp,
xfs_rtxnum_t rtx)
{
return (rtx >> XFS_NBWORDLOG) & XFS_BLOCKWMASK(mp);
return (rtx >> XFS_NBWORDLOG) & (mp->m_blockwsize - 1);
}
/* Convert a file block offset in the rt bitmap file to an rt extent number. */