From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Carlos Maiolino <cem@kernel.org>, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 7/9] xfs: remove the xlog_rec_header_t typedef
Date: Tue, 14 Oct 2025 15:08:17 -0700 [thread overview]
Message-ID: <20251014220817.GM6188@frogsfrogsfrogs> (raw)
In-Reply-To: <20251013024228.4109032-8-hch@lst.de>
On Mon, Oct 13, 2025 at 11:42:11AM +0900, Christoph Hellwig wrote:
> There are almost no users of the typedef left, kill it and switch the
> remaining users to use the underlying struct.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Woot.
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
--D
> ---
> fs/xfs/libxfs/xfs_log_format.h | 4 ++--
> fs/xfs/xfs_log.c | 6 +++---
> fs/xfs/xfs_log_recover.c | 28 ++++++++++++++--------------
> 3 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
> index 4cb69bd285ca..908e7060428c 100644
> --- a/fs/xfs/libxfs/xfs_log_format.h
> +++ b/fs/xfs/libxfs/xfs_log_format.h
> @@ -136,7 +136,7 @@ struct xlog_rec_ext_header {
> #define XLOG_REC_EXT_SIZE \
> offsetofend(struct xlog_rec_ext_header, xh_cycle_data)
>
> -typedef struct xlog_rec_header {
> +struct xlog_rec_header {
> __be32 h_magicno; /* log record (LR) identifier : 4 */
> __be32 h_cycle; /* write cycle of log : 4 */
> __be32 h_version; /* LR version : 4 */
> @@ -174,7 +174,7 @@ typedef struct xlog_rec_header {
>
> __u8 h_reserved[184];
> struct xlog_rec_ext_header h_ext[];
> -} xlog_rec_header_t;
> +};
>
> #ifdef __i386__
> #define XLOG_REC_SIZE offsetofend(struct xlog_rec_header, h_size)
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 1fe3abbd3d36..8b3b79699596 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -2578,9 +2578,9 @@ xlog_state_get_iclog_space(
> struct xlog_ticket *ticket,
> int *logoffsetp)
> {
> - int log_offset;
> - xlog_rec_header_t *head;
> - xlog_in_core_t *iclog;
> + int log_offset;
> + struct xlog_rec_header *head;
> + struct xlog_in_core *iclog;
>
> restart:
> spin_lock(&log->l_icloglock);
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index ef0f6efc4381..03e42c7dab56 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -190,8 +190,8 @@ xlog_bwrite(
> */
> STATIC void
> xlog_header_check_dump(
> - xfs_mount_t *mp,
> - xlog_rec_header_t *head)
> + struct xfs_mount *mp,
> + struct xlog_rec_header *head)
> {
> xfs_debug(mp, "%s: SB : uuid = %pU, fmt = %d",
> __func__, &mp->m_sb.sb_uuid, XLOG_FMT);
> @@ -207,8 +207,8 @@ xlog_header_check_dump(
> */
> STATIC int
> xlog_header_check_recover(
> - xfs_mount_t *mp,
> - xlog_rec_header_t *head)
> + struct xfs_mount *mp,
> + struct xlog_rec_header *head)
> {
> ASSERT(head->h_magicno == cpu_to_be32(XLOG_HEADER_MAGIC_NUM));
>
> @@ -238,8 +238,8 @@ xlog_header_check_recover(
> */
> STATIC int
> xlog_header_check_mount(
> - xfs_mount_t *mp,
> - xlog_rec_header_t *head)
> + struct xfs_mount *mp,
> + struct xlog_rec_header *head)
> {
> ASSERT(head->h_magicno == cpu_to_be32(XLOG_HEADER_MAGIC_NUM));
>
> @@ -400,7 +400,7 @@ xlog_find_verify_log_record(
> xfs_daddr_t i;
> char *buffer;
> char *offset = NULL;
> - xlog_rec_header_t *head = NULL;
> + struct xlog_rec_header *head = NULL;
> int error = 0;
> int smallmem = 0;
> int num_blks = *last_blk - start_blk;
> @@ -437,7 +437,7 @@ xlog_find_verify_log_record(
> goto out;
> }
>
> - head = (xlog_rec_header_t *)offset;
> + head = (struct xlog_rec_header *)offset;
>
> if (head->h_magicno == cpu_to_be32(XLOG_HEADER_MAGIC_NUM))
> break;
> @@ -1237,7 +1237,7 @@ xlog_find_tail(
> xfs_daddr_t *head_blk,
> xfs_daddr_t *tail_blk)
> {
> - xlog_rec_header_t *rhead;
> + struct xlog_rec_header *rhead;
> char *offset = NULL;
> char *buffer;
> int error;
> @@ -1487,7 +1487,7 @@ xlog_add_record(
> int tail_cycle,
> int tail_block)
> {
> - xlog_rec_header_t *recp = (xlog_rec_header_t *)buf;
> + struct xlog_rec_header *recp = (struct xlog_rec_header *)buf;
>
> memset(buf, 0, BBSIZE);
> recp->h_magicno = cpu_to_be32(XLOG_HEADER_MAGIC_NUM);
> @@ -2997,7 +2997,7 @@ xlog_do_recovery_pass(
> int pass,
> xfs_daddr_t *first_bad) /* out: first bad log rec */
> {
> - xlog_rec_header_t *rhead;
> + struct xlog_rec_header *rhead;
> xfs_daddr_t blk_no, rblk_no;
> xfs_daddr_t rhead_blk;
> char *offset;
> @@ -3034,7 +3034,7 @@ xlog_do_recovery_pass(
> if (error)
> goto bread_err1;
>
> - rhead = (xlog_rec_header_t *)offset;
> + rhead = (struct xlog_rec_header *)offset;
>
> /*
> * xfsprogs has a bug where record length is based on lsunit but
> @@ -3141,7 +3141,7 @@ xlog_do_recovery_pass(
> if (error)
> goto bread_err2;
> }
> - rhead = (xlog_rec_header_t *)offset;
> + rhead = (struct xlog_rec_header *)offset;
> error = xlog_valid_rec_header(log, rhead,
> split_hblks ? blk_no : 0, h_size);
> if (error)
> @@ -3223,7 +3223,7 @@ xlog_do_recovery_pass(
> if (error)
> goto bread_err2;
>
> - rhead = (xlog_rec_header_t *)offset;
> + rhead = (struct xlog_rec_header *)offset;
> error = xlog_valid_rec_header(log, rhead, blk_no, h_size);
> if (error)
> goto bread_err2;
> --
> 2.47.3
>
>
next prev parent reply other threads:[~2025-10-14 22:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-13 2:42 kill xlog_in_core_2_t v2 Christoph Hellwig
2025-10-13 2:42 ` [PATCH 1/9] xfs: add a XLOG_CYCLE_DATA_SIZE constant Christoph Hellwig
2025-10-14 21:16 ` Darrick J. Wong
2025-10-13 2:42 ` [PATCH 2/9] xfs: add a on-disk log header cycle array accessor Christoph Hellwig
2025-10-14 21:27 ` Darrick J. Wong
2025-10-15 4:32 ` Christoph Hellwig
2025-10-15 20:25 ` Darrick J. Wong
2025-10-13 2:42 ` [PATCH 3/9] xfs: don't use xlog_in_core_2_t in struct xlog_in_core Christoph Hellwig
2025-10-14 21:47 ` Darrick J. Wong
2025-10-15 4:34 ` Christoph Hellwig
2025-10-15 20:26 ` Darrick J. Wong
2025-10-13 2:42 ` [PATCH 4/9] xfs: cleanup xlog_alloc_log a bit Christoph Hellwig
2025-10-14 21:48 ` Darrick J. Wong
2025-10-13 2:42 ` [PATCH 5/9] xfs: remove a very outdated comment from xlog_alloc_log Christoph Hellwig
2025-10-14 21:52 ` Darrick J. Wong
2025-10-15 4:37 ` Christoph Hellwig
2025-10-13 2:42 ` [PATCH 6/9] xfs: remove xlog_in_core_2_t Christoph Hellwig
2025-10-14 22:07 ` Darrick J. Wong
2025-10-15 4:41 ` Christoph Hellwig
2025-10-15 20:27 ` Darrick J. Wong
2025-10-13 2:42 ` [PATCH 7/9] xfs: remove the xlog_rec_header_t typedef Christoph Hellwig
2025-10-14 22:08 ` Darrick J. Wong [this message]
2025-10-13 2:42 ` [PATCH 8/9] xfs: remove l_iclog_heads Christoph Hellwig
2025-10-14 22:12 ` Darrick J. Wong
2025-10-13 2:42 ` [PATCH 9/9] xfs: remove the xlog_in_core_t typedef Christoph Hellwig
2025-10-14 22:12 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2025-10-27 7:05 kill xlog_in_core_2_t v3 Christoph Hellwig
2025-10-27 7:05 ` [PATCH 7/9] xfs: remove the xlog_rec_header_t typedef Christoph Hellwig
2025-10-31 14:13 ` Carlos Maiolino
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=20251014220817.GM6188@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=cem@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).