From: Christoph Hellwig <hch@lst.de>
To: Andrey Albershteyn <aalbersh@kernel.org>
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 24/25] logprint: cleanup xlog_print_extended_headers
Date: Fri, 28 Nov 2025 07:30:01 +0100 [thread overview]
Message-ID: <20251128063007.1495036-25-hch@lst.de> (raw)
In-Reply-To: <20251128063007.1495036-1-hch@lst.de>
Re-indent and drop typedefs.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
logprint/log_misc.c | 45 +++++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 94efd3839f8b..ea696fb282d3 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -1388,49 +1388,46 @@ xlog_print_ext_header(
/* for V2 logs read each extra hdr and print it out */
static int
xlog_print_extended_headers(
- int fd,
- int len,
- xfs_daddr_t *blkno,
- xlog_rec_header_t *hdr,
- int *ret_num_hdrs,
- xlog_rec_ext_header_t **ret_xhdrs)
+ int fd,
+ int len,
+ xfs_daddr_t *blkno,
+ struct xlog_rec_header *hdr,
+ int *ret_num_hdrs,
+ struct xlog_rec_ext_header **ret_xhdrs)
{
- int i;
- int num_hdrs;
- int num_required;
- xlog_rec_ext_header_t *xhdr;
+ int num_hdrs, num_required;
+ struct xlog_rec_ext_header *xhdr;
+ int i;
num_required = howmany(len, XLOG_HEADER_CYCLE_SIZE);
num_hdrs = be32_to_cpu(hdr->h_size) / XLOG_HEADER_CYCLE_SIZE;
if (be32_to_cpu(hdr->h_size) % XLOG_HEADER_CYCLE_SIZE)
num_hdrs++;
- if (num_required > num_hdrs) {
- print_xlog_bad_reqd_hdrs((*blkno)-1, num_required, num_hdrs);
- }
+ if (num_required > num_hdrs)
+ print_xlog_bad_reqd_hdrs(*blkno - 1, num_required, num_hdrs);
if (num_hdrs == 1) {
- free(*ret_xhdrs);
- *ret_xhdrs = NULL;
- *ret_num_hdrs = 1;
- return 0;
- }
-
- if (*ret_xhdrs == NULL || num_hdrs > *ret_num_hdrs) {
- xlog_reallocate_xhdrs(num_hdrs, ret_xhdrs);
+ free(*ret_xhdrs);
+ *ret_xhdrs = NULL;
+ *ret_num_hdrs = 1;
+ return 0;
}
+ if (*ret_xhdrs == NULL || num_hdrs > *ret_num_hdrs)
+ xlog_reallocate_xhdrs(num_hdrs, ret_xhdrs);
*ret_num_hdrs = num_hdrs;
/* don't include 1st header */
for (i = 1, xhdr = *ret_xhdrs; i < num_hdrs; i++, (*blkno)++, xhdr++) {
- if (xlog_print_ext_header(fd, len, *blkno, xhdr, i == num_hdrs - 1))
- return 1;
+ if (xlog_print_ext_header(fd, len, *blkno, xhdr,
+ i == num_hdrs - 1))
+ return 1;
}
+
return 0;
}
-
/*
* This code is gross and needs to be rewritten.
*/
--
2.47.3
next prev parent reply other threads:[~2025-11-28 6:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-28 6:29 logprint cleanups, part1 Christoph Hellwig
2025-11-28 6:29 ` [PATCH 01/25] include: remove struct xfs_qoff_logitem Christoph Hellwig
2025-11-28 6:29 ` [PATCH 02/25] logprint: remove xlog_print_dir2_sf Christoph Hellwig
2025-11-28 6:29 ` [PATCH 03/25] logprint: re-indent printing helpers Christoph Hellwig
2025-11-28 6:29 ` [PATCH 04/25] logprint: cleanup xlog_print_op_header Christoph Hellwig
2025-11-28 6:29 ` [PATCH 05/25] logprint: cleanup struct xlog_split_item handling Christoph Hellwig
2025-11-28 6:29 ` [PATCH 06/25] logprint: cleanup xlog_print_trans_header Christoph Hellwig
2025-11-28 6:29 ` [PATCH 07/25] logprint: split per-type helpers out of xlog_print_trans_buffer Christoph Hellwig
2025-11-28 6:29 ` [PATCH 08/25] logprint: cleanup xlog_print_trans_buffer Christoph Hellwig
2025-11-28 6:29 ` [PATCH 09/25] logprint: cleanup xlog_print_trans_qoff Christoph Hellwig
2025-11-28 6:29 ` [PATCH 10/25] logprint: cleanup xlog_print_trans_inode_core Christoph Hellwig
2025-12-01 18:23 ` Andrey Albershteyn
2025-12-02 7:27 ` Christoph Hellwig
2025-11-28 6:29 ` [PATCH 11/25] logprint: move xfs_inode_item_format_convert up Christoph Hellwig
2025-12-01 18:32 ` Andrey Albershteyn
2025-12-02 7:28 ` Christoph Hellwig
2025-11-28 6:29 ` [PATCH 12/25] logprint: cleanup xlog_print_trans_inode Christoph Hellwig
2025-11-28 6:29 ` [PATCH 13/25] logprint: cleanup xlog_print_trans_dquot Christoph Hellwig
2025-11-28 6:29 ` [PATCH 14/25] logprint: re-indent print_lseek / print_lsn Christoph Hellwig
2025-11-28 6:29 ` [PATCH 15/25] logprint: factor out a xlog_print_process_region helper Christoph Hellwig
2025-11-28 6:29 ` [PATCH 16/25] logprint: factor out a xlog_print_op helper Christoph Hellwig
2025-12-01 18:44 ` Andrey Albershteyn
2025-12-02 7:29 ` Christoph Hellwig
2025-11-28 6:29 ` [PATCH 17/25] logprint: factor out a xlog_unpack_rec_header Christoph Hellwig
2025-11-28 6:29 ` [PATCH 18/25] logprint: cleanup xlog_print_record Christoph Hellwig
2025-11-28 6:29 ` [PATCH 19/25] logprint: cleanup xlog_print_rec_head Christoph Hellwig
2025-11-28 6:29 ` [PATCH 20/25] logprint: cleanup xlog_print_rec_xhead Christoph Hellwig
2025-11-28 6:29 ` [PATCH 21/25] logprint: re-indent print_xlog_bad_* Christoph Hellwig
2025-11-28 6:29 ` [PATCH 22/25] logprint: cleanup xlog_reallocate_xhdrs Christoph Hellwig
2025-11-28 6:30 ` [PATCH 23/25] logprint: factor out a xlog_print_ext_header helper Christoph Hellwig
2025-11-28 6:30 ` Christoph Hellwig [this message]
2025-11-28 6:30 ` [PATCH 25/25] logprint: cleanup xfs_log_print Christoph Hellwig
2025-12-01 19:03 ` logprint cleanups, part1 Andrey Albershteyn
2025-12-02 7:29 ` Christoph Hellwig
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=20251128063007.1495036-25-hch@lst.de \
--to=hch@lst.de \
--cc=aalbersh@kernel.org \
--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