From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Chandan Babu R <chandan.babu@oracle.com>, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 15/19] xfs: remove rt-wrappers from xfs_format.h
Date: Thu, 14 Dec 2023 13:18:54 -0800 [thread overview]
Message-ID: <20231214211854.GE361584@frogsfrogsfrogs> (raw)
In-Reply-To: <20231214063438.290538-16-hch@lst.de>
On Thu, Dec 14, 2023 at 07:34:34AM +0100, Christoph Hellwig wrote:
> xfs_format.h has a bunch odd wrappers for helper functions and mount
> structure access using RT* prefixes. Replace them with their open coded
> versions (for those that weren't entirely unused) and remove the wrappers.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/xfs/libxfs/xfs_format.h | 8 --------
> fs/xfs/libxfs/xfs_rtbitmap.c | 24 ++++++++++++------------
> fs/xfs/scrub/rtsummary.c | 2 +-
> fs/xfs/xfs_rtalloc.c | 6 +++---
> 4 files changed, 16 insertions(+), 24 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
> index 9a88aba1589f87..82a4ab2d89e9f0 100644
> --- a/fs/xfs/libxfs/xfs_format.h
> +++ b/fs/xfs/libxfs/xfs_format.h
> @@ -1156,20 +1156,12 @@ static inline bool xfs_dinode_has_large_extent_counts(
> #define XFS_DFL_RTEXTSIZE (64 * 1024) /* 64kB */
> #define XFS_MIN_RTEXTSIZE (4 * 1024) /* 4kB */
>
> -#define XFS_BLOCKSIZE(mp) ((mp)->m_sb.sb_blocksize)
> -#define XFS_BLOCKMASK(mp) ((mp)->m_blockmask)
Apparently I forgot to get rid of these when I demacro'd the code.
Thanks for picking that up,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> -
> /*
> * RT bit manipulation macros.
> */
> #define XFS_RTMIN(a,b) ((a) < (b) ? (a) : (b))
> #define XFS_RTMAX(a,b) ((a) > (b) ? (a) : (b))
>
> -#define XFS_RTLOBIT(w) xfs_lowbit32(w)
> -#define XFS_RTHIBIT(w) xfs_highbit32(w)
> -
> -#define XFS_RTBLOCKLOG(b) xfs_highbit64(b)
> -
> /*
> * Dquot and dquot block format definitions
> */
> diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
> index 5773e4ea36c624..4185ccf83bab68 100644
> --- a/fs/xfs/libxfs/xfs_rtbitmap.c
> +++ b/fs/xfs/libxfs/xfs_rtbitmap.c
> @@ -195,7 +195,7 @@ xfs_rtfind_back(
> /*
> * Different. Mark where we are and return.
> */
> - i = bit - XFS_RTHIBIT(wdiff);
> + i = bit - xfs_highbit32(wdiff);
> *rtx = start - i + 1;
> return 0;
> }
> @@ -233,7 +233,7 @@ xfs_rtfind_back(
> /*
> * Different, mark where we are and return.
> */
> - i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff);
> + i += XFS_NBWORD - 1 - xfs_highbit32(wdiff);
> *rtx = start - i + 1;
> return 0;
> }
> @@ -272,7 +272,7 @@ xfs_rtfind_back(
> /*
> * Different, mark where we are and return.
> */
> - i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff);
> + i += XFS_NBWORD - 1 - xfs_highbit32(wdiff);
> *rtx = start - i + 1;
> return 0;
> } else
> @@ -348,7 +348,7 @@ xfs_rtfind_forw(
> /*
> * Different. Mark where we are and return.
> */
> - i = XFS_RTLOBIT(wdiff) - bit;
> + i = xfs_lowbit32(wdiff) - bit;
> *rtx = start + i - 1;
> return 0;
> }
> @@ -386,7 +386,7 @@ xfs_rtfind_forw(
> /*
> * Different, mark where we are and return.
> */
> - i += XFS_RTLOBIT(wdiff);
> + i += xfs_lowbit32(wdiff);
> *rtx = start + i - 1;
> return 0;
> }
> @@ -423,7 +423,7 @@ xfs_rtfind_forw(
> /*
> * Different, mark where we are and return.
> */
> - i += XFS_RTLOBIT(wdiff);
> + i += xfs_lowbit32(wdiff);
> *rtx = start + i - 1;
> return 0;
> } else
> @@ -708,7 +708,7 @@ xfs_rtfree_range(
> */
> if (preblock < start) {
> error = xfs_rtmodify_summary(args,
> - XFS_RTBLOCKLOG(start - preblock),
> + xfs_highbit64(start - preblock),
> xfs_rtx_to_rbmblock(mp, preblock), -1);
> if (error) {
> return error;
> @@ -720,7 +720,7 @@ xfs_rtfree_range(
> */
> if (postblock > end) {
> error = xfs_rtmodify_summary(args,
> - XFS_RTBLOCKLOG(postblock - end),
> + xfs_highbit64(postblock - end),
> xfs_rtx_to_rbmblock(mp, end + 1), -1);
> if (error) {
> return error;
> @@ -731,7 +731,7 @@ xfs_rtfree_range(
> * (new) free extent.
> */
> return xfs_rtmodify_summary(args,
> - XFS_RTBLOCKLOG(postblock + 1 - preblock),
> + xfs_highbit64(postblock + 1 - preblock),
> xfs_rtx_to_rbmblock(mp, preblock), 1);
> }
>
> @@ -800,7 +800,7 @@ xfs_rtcheck_range(
> /*
> * Different, compute first wrong bit and return.
> */
> - i = XFS_RTLOBIT(wdiff) - bit;
> + i = xfs_lowbit32(wdiff) - bit;
> *new = start + i;
> *stat = 0;
> return 0;
> @@ -839,7 +839,7 @@ xfs_rtcheck_range(
> /*
> * Different, compute first wrong bit and return.
> */
> - i += XFS_RTLOBIT(wdiff);
> + i += xfs_lowbit32(wdiff);
> *new = start + i;
> *stat = 0;
> return 0;
> @@ -877,7 +877,7 @@ xfs_rtcheck_range(
> /*
> * Different, compute first wrong bit and return.
> */
> - i += XFS_RTLOBIT(wdiff);
> + i += xfs_lowbit32(wdiff);
> *new = start + i;
> *stat = 0;
> return 0;
> diff --git a/fs/xfs/scrub/rtsummary.c b/fs/xfs/scrub/rtsummary.c
> index 8b15c47408d031..0689025aa4849d 100644
> --- a/fs/xfs/scrub/rtsummary.c
> +++ b/fs/xfs/scrub/rtsummary.c
> @@ -143,7 +143,7 @@ xchk_rtsum_record_free(
>
> /* Compute the relevant location in the rtsum file. */
> rbmoff = xfs_rtx_to_rbmblock(mp, rec->ar_startext);
> - lenlog = XFS_RTBLOCKLOG(rec->ar_extcount);
> + lenlog = xfs_highbit64(rec->ar_extcount);
> offs = xfs_rtsumoffs(mp, lenlog, rbmoff);
>
> rtbno = xfs_rtx_to_rtb(mp, rec->ar_startext);
> diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
> index 2e578e726e9137..70b4eb840df4f3 100644
> --- a/fs/xfs/xfs_rtalloc.c
> +++ b/fs/xfs/xfs_rtalloc.c
> @@ -156,7 +156,7 @@ xfs_rtallocate_range(
> * (old) free extent.
> */
> error = xfs_rtmodify_summary(args,
> - XFS_RTBLOCKLOG(postblock + 1 - preblock),
> + xfs_highbit64(postblock + 1 - preblock),
> xfs_rtx_to_rbmblock(mp, preblock), -1);
> if (error)
> return error;
> @@ -167,7 +167,7 @@ xfs_rtallocate_range(
> */
> if (preblock < start) {
> error = xfs_rtmodify_summary(args,
> - XFS_RTBLOCKLOG(start - preblock),
> + xfs_highbit64(start - preblock),
> xfs_rtx_to_rbmblock(mp, preblock), 1);
> if (error)
> return error;
> @@ -179,7 +179,7 @@ xfs_rtallocate_range(
> */
> if (postblock > end) {
> error = xfs_rtmodify_summary(args,
> - XFS_RTBLOCKLOG(postblock - end),
> + xfs_highbit64(postblock - end),
> xfs_rtx_to_rbmblock(mp, end + 1), 1);
> if (error)
> return error;
> --
> 2.39.2
>
>
next prev parent reply other threads:[~2023-12-14 21:18 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-14 6:34 RT allocator tidy ups Christoph Hellwig
2023-12-14 6:34 ` [PATCH 01/19] xfs: consider minlen sized extents in xfs_rtallocate_extent_block Christoph Hellwig
2023-12-14 21:02 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 02/19] xfs: turn the xfs_trans_mod_dquot_byino stub into an inline function Christoph Hellwig
2023-12-14 20:44 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 03/19] xfs: remove the xfs_alloc_arg argument to xfs_bmap_btalloc_accounting Christoph Hellwig
2023-12-14 20:46 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 04/19] xfs: also use xfs_bmap_btalloc_accounting for RT allocations Christoph Hellwig
2023-12-14 20:46 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 05/19] xfs: move xfs_bmap_rtalloc to xfs_rtalloc.c Christoph Hellwig
2023-12-14 20:48 ` Darrick J. Wong
2023-12-15 4:09 ` Christoph Hellwig
2023-12-15 6:35 ` Christoph Hellwig
2023-12-14 6:34 ` [PATCH 06/19] xfs: return -ENOSPC from xfs_rtallocate_* Christoph Hellwig
2023-12-14 20:50 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 07/19] xfs: reflow the tail end of xfs_bmap_rtalloc Christoph Hellwig
2023-12-14 20:51 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 08/19] xfs: indicate if xfs_bmap_adjacent changed ap->blkno Christoph Hellwig
2023-12-14 20:52 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 09/19] xfs: cleanup picking the start extent hint in xfs_bmap_rtalloc Christoph Hellwig
2023-12-14 20:59 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 10/19] xfs: move xfs_rtget_summary to xfs_rtbitmap.c Christoph Hellwig
2023-12-14 21:00 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 11/19] xfs: split xfs_rtmodify_summary_int Christoph Hellwig
2023-12-14 21:02 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 12/19] xfs: tidy up xfs_rtallocate_extent_block Christoph Hellwig
2023-12-14 21:16 ` Darrick J. Wong
2023-12-15 4:10 ` Christoph Hellwig
2023-12-14 6:34 ` [PATCH 13/19] xfs: tidy up xfs_rtallocate_extent_exact Christoph Hellwig
2023-12-14 21:17 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 14/19] xfs: factor out a xfs_rtalloc_sumlevel helper Christoph Hellwig
2023-12-14 21:05 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 15/19] xfs: remove rt-wrappers from xfs_format.h Christoph Hellwig
2023-12-14 21:18 ` Darrick J. Wong [this message]
2023-12-14 6:34 ` [PATCH 16/19] xfs: remove XFS_RTMIN/XFS_RTMAX Christoph Hellwig
2023-12-14 21:21 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 17/19] xfs: reorder the minlen and prod calculations in xfs_bmap_rtalloc Christoph Hellwig
2023-12-14 21:24 ` Darrick J. Wong
2023-12-14 6:34 ` [PATCH 18/19] xfs: simplify and optimize the RT allocation fallback cascade Christoph Hellwig
2023-12-14 21:32 ` Darrick J. Wong
2023-12-15 4:12 ` Christoph Hellwig
2023-12-14 6:34 ` [PATCH 19/19] xfs: fold xfs_rtallocate_extent into xfs_bmap_rtalloc Christoph Hellwig
2023-12-14 21:35 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231214211854.GE361584@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=chandan.babu@oracle.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox