From: Darrick J. Wong <djwong@xxxxxxxxxx>
Create a helper function to grab a realtime metadata inode. When
metadir arrives, the bitmap and summary inodes can float, so we'll
turn this function into a "load or allocate" function.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
repair/phase6.c | 90 ++++++++++++++++++++++++++++++++-----------------------
1 file changed, 53 insertions(+), 37 deletions(-)
diff --git a/repair/phase6.c b/repair/phase6.c
index 7e751f41770..aaaebc79098 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -469,18 +469,37 @@ reset_root_ino(
libxfs_inode_init(tp, &args, ip);
}
+/* Load a realtime metadata inode from disk and reset it. */
+static int
+ensure_rtino(
+ struct xfs_trans **tpp,
+ xfs_ino_t ino,
+ struct xfs_inode **ipp)
+{
+ struct xfs_mount *mp = (*tpp)->t_mountp;
+ int error;
+
+ error = -libxfs_iget(mp, *tpp, ino, 0, ipp);
+ if (error)
+ return error;
+
+ reset_root_ino(*tpp, S_IFREG, *ipp);
+ return 0;
+}
+
static void
-mk_rbmino(xfs_mount_t *mp)
+mk_rbmino(
+ struct xfs_mount *mp)
{
- xfs_trans_t *tp;
- xfs_inode_t *ip;
- xfs_bmbt_irec_t *ep;
- int i;
- int nmap;
- int error;
- xfs_fileoff_t bno;
- xfs_bmbt_irec_t map[XFS_BMAP_MAX_NMAP];
- uint blocks;
+ struct xfs_trans *tp;
+ struct xfs_inode *ip;
+ struct xfs_bmbt_irec *ep;
+ int i;
+ int nmap;
+ int error;
+ xfs_fileoff_t bno;
+ struct xfs_bmbt_irec map[XFS_BMAP_MAX_NMAP];
+ uint blocks;
/*
* first set up inode
@@ -489,15 +508,13 @@ mk_rbmino(xfs_mount_t *mp)
if (i)
res_failed(i);
- error = -libxfs_iget(mp, tp, mp->m_sb.sb_rbmino, 0, &ip);
- if (error) {
- do_error(
- _("couldn't iget realtime bitmap inode -- error - %d\n"),
- error);
- }
-
/* Reset the realtime bitmap inode. */
- reset_root_ino(tp, S_IFREG, ip);
+ error = ensure_rtino(&tp, mp->m_sb.sb_rbmino, &ip);
+ if (error) {
+ do_error(
+ _("couldn't iget realtime bitmap inode -- error - %d\n"),
+ error);
+ }
ip->i_disk_size = mp->m_sb.sb_rbmblocks * mp->m_sb.sb_blocksize;
libxfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
error = -libxfs_trans_commit(tp);
@@ -682,18 +699,19 @@ _("can't access block %" PRIu64 " (fsbno %" PRIu64 ") of realtime summary inode
}
static void
-mk_rsumino(xfs_mount_t *mp)
+mk_rsumino(
+ struct xfs_mount *mp)
{
- xfs_trans_t *tp;
- xfs_inode_t *ip;
- xfs_bmbt_irec_t *ep;
- int i;
- int nmap;
- int error;
- int nsumblocks;
- xfs_fileoff_t bno;
- xfs_bmbt_irec_t map[XFS_BMAP_MAX_NMAP];
- uint blocks;
+ struct xfs_trans *tp;
+ struct xfs_inode *ip;
+ struct xfs_bmbt_irec *ep;
+ int i;
+ int nmap;
+ int error;
+ int nsumblocks;
+ xfs_fileoff_t bno;
+ struct xfs_bmbt_irec map[XFS_BMAP_MAX_NMAP];
+ uint blocks;
/*
* first set up inode
@@ -702,15 +720,13 @@ mk_rsumino(xfs_mount_t *mp)
if (i)
res_failed(i);
- error = -libxfs_iget(mp, tp, mp->m_sb.sb_rsumino, 0, &ip);
- if (error) {
- do_error(
- _("couldn't iget realtime summary inode -- error - %d\n"),
- error);
- }
-
/* Reset the rt summary inode. */
- reset_root_ino(tp, S_IFREG, ip);
+ error = ensure_rtino(&tp, mp->m_sb.sb_rsumino, &ip);
+ if (error) {
+ do_error(
+ _("couldn't iget realtime summary inode -- error - %d\n"),
+ error);
+ }
ip->i_disk_size = mp->m_rsumsize;
libxfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
error = -libxfs_trans_commit(tp);
