From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 05/10] xfs: turn ag header initialisation into a table driven operation
Date: Mon, 14 May 2018 14:18:59 +1000 [thread overview]
Message-ID: <20180514041904.11140-6-david@fromorbit.com> (raw)
In-Reply-To: <20180514041904.11140-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
There's still more cookie cutter code in setting up each AG header.
Separate all the variables into a simple structure and iterate a
table of header definitions to initialise everything.
Signed-Off-By: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
---
fs/xfs/xfs_fsops.c | 182 +++++++++++++++++++++++----------------------
1 file changed, 92 insertions(+), 90 deletions(-)
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index ec3c51ee8134..fb283d2cf42b 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -282,12 +282,13 @@ xfs_agiblock_init(
agi->agi_unlinked[bucket] = cpu_to_be32(NULLAGINO);
}
+typedef void (*aghdr_init_work_f)(struct xfs_mount *mp, struct xfs_buf *bp,
+ struct aghdr_init_data *id);
static int
xfs_growfs_init_aghdr(
struct xfs_mount *mp,
struct aghdr_init_data *id,
- void (*work)(struct xfs_mount *, struct xfs_buf *,
- struct aghdr_init_data *),
+ aghdr_init_work_f work,
const struct xfs_buf_ops *ops)
{
@@ -304,6 +305,15 @@ xfs_growfs_init_aghdr(
return 0;
}
+struct xfs_aghdr_grow_data {
+ xfs_daddr_t daddr;
+ size_t numblks;
+ const struct xfs_buf_ops *ops;
+ aghdr_init_work_f work;
+ xfs_btnum_t type;
+ bool need_init;
+};
+
/*
* Write new AG headers to disk. Non-transactional, but written
* synchronously so they are completed prior to the growfs transaction
@@ -315,101 +325,93 @@ xfs_grow_ag_headers(
struct aghdr_init_data *id)
{
+ struct xfs_aghdr_grow_data aghdr_data[] = {
+ { /* AGF */
+ .daddr = XFS_AG_DADDR(mp, id->agno, XFS_AGF_DADDR(mp)),
+ .numblks = XFS_FSS_TO_BB(mp, 1),
+ .ops = &xfs_agf_buf_ops,
+ .work = &xfs_agfblock_init,
+ .need_init = true
+ },
+ { /* AGFL */
+ .daddr = XFS_AG_DADDR(mp, id->agno, XFS_AGFL_DADDR(mp)),
+ .numblks = XFS_FSS_TO_BB(mp, 1),
+ .ops = &xfs_agfl_buf_ops,
+ .work = &xfs_agflblock_init,
+ .need_init = true
+ },
+ { /* AGI */
+ .daddr = XFS_AG_DADDR(mp, id->agno, XFS_AGI_DADDR(mp)),
+ .numblks = XFS_FSS_TO_BB(mp, 1),
+ .ops = &xfs_agi_buf_ops,
+ .work = &xfs_agiblock_init,
+ .need_init = true
+ },
+ { /* BNO root block */
+ .daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_BNO_BLOCK(mp)),
+ .numblks = BTOBB(mp->m_sb.sb_blocksize),
+ .ops = &xfs_allocbt_buf_ops,
+ .work = &xfs_bnoroot_init,
+ .need_init = true
+ },
+ { /* CNT root block */
+ .daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_CNT_BLOCK(mp)),
+ .numblks = BTOBB(mp->m_sb.sb_blocksize),
+ .ops = &xfs_allocbt_buf_ops,
+ .work = &xfs_cntroot_init,
+ .need_init = true
+ },
+ { /* INO root block */
+ .daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_IBT_BLOCK(mp)),
+ .numblks = BTOBB(mp->m_sb.sb_blocksize),
+ .ops = &xfs_inobt_buf_ops,
+ .work = &xfs_btroot_init,
+ .type = XFS_BTNUM_INO,
+ .need_init = true
+ },
+ { /* FINO root block */
+ .daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_FIBT_BLOCK(mp)),
+ .numblks = BTOBB(mp->m_sb.sb_blocksize),
+ .ops = &xfs_inobt_buf_ops,
+ .work = &xfs_btroot_init,
+ .type = XFS_BTNUM_FINO,
+ .need_init = xfs_sb_version_hasfinobt(&mp->m_sb)
+ },
+ { /* RMAP root block */
+ .daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_RMAP_BLOCK(mp)),
+ .numblks = BTOBB(mp->m_sb.sb_blocksize),
+ .ops = &xfs_rmapbt_buf_ops,
+ .work = &xfs_rmaproot_init,
+ .need_init = xfs_sb_version_hasrmapbt(&mp->m_sb)
+ },
+ { /* REFC root block */
+ .daddr = XFS_AGB_TO_DADDR(mp, id->agno, xfs_refc_block(mp)),
+ .numblks = BTOBB(mp->m_sb.sb_blocksize),
+ .ops = &xfs_refcountbt_buf_ops,
+ .work = &xfs_btroot_init,
+ .type = XFS_BTNUM_REFC,
+ .need_init = xfs_sb_version_hasreflink(&mp->m_sb)
+ },
+ { /* NULL terminating block */
+ .daddr = XFS_BUF_DADDR_NULL,
+ }
+ };
+ struct xfs_aghdr_grow_data *dp;
int error = 0;
/* Account for AG free space in new AG */
id->nfree += id->agsize - mp->m_ag_prealloc_blocks;
+ for (dp = &aghdr_data[0]; dp->daddr != XFS_BUF_DADDR_NULL; dp++) {
+ if (!dp->need_init)
+ continue;
- /* AG freespace header block */
- id->daddr = XFS_AG_DADDR(mp, id->agno, XFS_AGF_DADDR(mp));
- id->numblks = XFS_FSS_TO_BB(mp, 1);
- error = xfs_growfs_init_aghdr(mp, id, xfs_agfblock_init,
- &xfs_agf_buf_ops);
- if (error)
- goto out_error;
-
- /* AG freelist header block */
- id->daddr = XFS_AG_DADDR(mp, id->agno, XFS_AGFL_DADDR(mp));
- id->numblks = XFS_FSS_TO_BB(mp, 1);
- error = xfs_growfs_init_aghdr(mp, id, xfs_agflblock_init,
- &xfs_agfl_buf_ops);
- if (error)
- goto out_error;
-
- /* AG inode header block */
- id->daddr = XFS_AG_DADDR(mp, id->agno, XFS_AGI_DADDR(mp));
- id->numblks = XFS_FSS_TO_BB(mp, 1);
- error = xfs_growfs_init_aghdr(mp, id, xfs_agiblock_init,
- &xfs_agi_buf_ops);
- if (error)
- goto out_error;
-
-
- /* BNO btree root block */
- id->daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_BNO_BLOCK(mp));
- id->numblks = BTOBB(mp->m_sb.sb_blocksize);
- error = xfs_growfs_init_aghdr(mp, id, xfs_bnoroot_init,
- &xfs_allocbt_buf_ops);
- if (error)
- goto out_error;
-
-
- /* CNT btree root block */
- id->daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_CNT_BLOCK(mp));
- id->numblks = BTOBB(mp->m_sb.sb_blocksize);
- error = xfs_growfs_init_aghdr(mp, id, xfs_cntroot_init,
- &xfs_allocbt_buf_ops);
- if (error)
- goto out_error;
-
- /* RMAP btree root block */
- if (xfs_sb_version_hasrmapbt(&mp->m_sb)) {
- id->daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_RMAP_BLOCK(mp));
- id->numblks = BTOBB(mp->m_sb.sb_blocksize);
- error = xfs_growfs_init_aghdr(mp, id, xfs_rmaproot_init,
- &xfs_rmapbt_buf_ops);
- if (error)
- goto out_error;
-
- }
-
- /* INO btree root block */
- id->daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_IBT_BLOCK(mp));
- id->numblks = BTOBB(mp->m_sb.sb_blocksize);
- id->type = XFS_BTNUM_INO;
- error = xfs_growfs_init_aghdr(mp, id, xfs_btroot_init,
- &xfs_inobt_buf_ops);
- if (error)
- goto out_error;
-
-
- /*
- * FINO btree root block
- */
- if (xfs_sb_version_hasfinobt(&mp->m_sb)) {
- id->daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_FIBT_BLOCK(mp));
- id->numblks = BTOBB(mp->m_sb.sb_blocksize);
- id->type = XFS_BTNUM_FINO;
- error = xfs_growfs_init_aghdr(mp, id, xfs_btroot_init,
- &xfs_inobt_buf_ops);
- if (error)
- goto out_error;
- }
-
- /*
- * refcount btree root block
- */
- if (xfs_sb_version_hasreflink(&mp->m_sb)) {
- id->daddr = XFS_AGB_TO_DADDR(mp, id->agno, xfs_refc_block(mp));
- id->numblks = BTOBB(mp->m_sb.sb_blocksize);
- id->type = XFS_BTNUM_REFC;
- error = xfs_growfs_init_aghdr(mp, id, xfs_btroot_init,
- &xfs_refcountbt_buf_ops);
+ id->daddr = dp->daddr;
+ id->numblks = dp->numblks;
+ id->type = dp->type;
+ error = xfs_growfs_init_aghdr(mp, id, dp->work, dp->ops);
if (error)
- goto out_error;
+ break;
}
-
-out_error:
return error;
}
--
2.17.0
next prev parent reply other threads:[~2018-05-14 4:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 4:18 [PATCH 0/10 v3] xfs: refactor and tablise growfs Dave Chinner
2018-05-14 4:18 ` [PATCH 01/10] xfs: one-shot cached buffers Dave Chinner
2018-05-14 4:18 ` [PATCH 02/10] xfs: factor out AG header initialisation from growfs core Dave Chinner
2018-05-14 19:28 ` Darrick J. Wong
2018-05-14 4:18 ` [PATCH 03/10] xfs: convert growfs AG header init to use buffer lists Dave Chinner
2018-05-14 4:18 ` [PATCH 04/10] xfs: factor ag btree root block initialisation Dave Chinner
2018-05-14 19:25 ` Darrick J. Wong
2018-05-14 4:18 ` Dave Chinner [this message]
2018-05-14 19:27 ` [PATCH 05/10] xfs: turn ag header initialisation into a table driven operation Darrick J. Wong
2018-05-14 4:19 ` [PATCH 06/10] xfs: make imaxpct changes in growfs separate Dave Chinner
2018-05-14 4:19 ` [PATCH 07/10] xfs: separate secondary sb update in growfs Dave Chinner
2018-05-14 4:19 ` [PATCH 08/10] xfs: rework secondary superblock updates " Dave Chinner
2018-05-14 4:19 ` [PATCH 09/10] xfs: move growfs core to libxfs Dave Chinner
2018-05-14 4:19 ` [PATCH 10/10] xfs: factor the ag length extension code into libxfs Dave Chinner
-- strict thread matches above, loose matches on Subject: below --
2018-05-11 22:50 [PATCH v2] xfs: refactor and tablise growfs Dave Chinner
2018-05-11 22:51 ` [PATCH 05/10] xfs: turn ag header initialisation into a table driven operation Dave Chinner
2018-05-12 0:55 ` Darrick J. Wong
2018-05-12 2:03 ` Dave Chinner
2018-05-12 2:05 ` 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=20180514041904.11140-6-david@fromorbit.com \
--to=david@fromorbit.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.