[PATCH 2/4] xfs_repair: allow sysadmins to add free inode btree indexes

Darrick J. Wong
2023-12-31T23:01:28Z

Allow the sysadmin to use xfs_repair to upgrade an existing filesystem
to support the free inode btree.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
man/man8/xfs_admin.8 | 7 +++++++
repair/globals.c | 1 +
repair/globals.h | 1 +
repair/phase2.c | 26 ++++++++++++++++++++++++++
repair/xfs_repair.c | 11 +++++++++++
5 files changed, 46 insertions(+)

diff --git a/man/man8/xfs_admin.8 b/man/man8/xfs_admin.8
index 4794d6774ed..efe2ce45fc2 100644
--- a/man/man8/xfs_admin.8
+++ b/man/man8/xfs_admin.8
@@ -156,6 +156,13 @@ data fork extent count will be 2^48 - 1, while the maximum attribute fork
extent count will be 2^32 - 1. The filesystem cannot be downgraded after this
feature is enabled. Once enabled, the filesystem will not be mountable by
older kernels. This feature was added to Linux 5.19.
+.TP 0.4i
+.B finobt
+Track free inodes through a separate free inode btree index to speed up inode
+allocation on old filesystems.
+This upgrade can fail if any AG has less than 1% free space remaining.
+The filesystem cannot be downgraded after this feature is enabled.
+This feature was added to Linux 3.16.
.RE
.TP
.BI \-U " uuid"
diff --git a/repair/globals.c b/repair/globals.c
index a68929bdc01..960dff28fba 100644
--- a/repair/globals.c
+++ b/repair/globals.c
@@ -52,6 +52,7 @@ bool features_changed; /* did we change superblock feature bits? */
bool add_inobtcount; /* add inode btree counts to AGI */
bool add_bigtime; /* add support for timestamps up to 2486 */
bool add_nrext64;
+bool add_finobt; /* add free inode btrees */

/* misc status variables */

diff --git a/repair/globals.h b/repair/globals.h
index a67e384a626..4ec68ecd896 100644
--- a/repair/globals.h
+++ b/repair/globals.h
@@ -93,6 +93,7 @@ extern bool features_changed; /* did we change superblock feature bits? */
extern bool add_inobtcount; /* add inode btree counts to AGI */
extern bool add_bigtime; /* add support for timestamps up to 2486 */
extern bool add_nrext64;
+extern bool add_finobt; /* add free inode btrees */

/* misc status variables */

diff --git a/repair/phase2.c b/repair/phase2.c
index 36eb0c21de5..5d2bb859514 100644
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -182,6 +182,28 @@ set_nrext64(
return true;
}

+static bool
+set_finobt(
+ struct xfs_mount *mp,
+ struct xfs_sb *new_sb)
+{
+ if (xfs_has_finobt(mp)) {
+ printf(_("Filesystem already supports free inode btrees.\n"));
+ exit(0);
+ }
+
+ if (!xfs_has_crc(mp)) {
+ printf(
+ _("Free inode btree feature only supported on V5 filesystems.\n"));
+ exit(0);
+ }
+
+ printf(_("Adding free inode btrees to filesystem.\n"));
+ new_sb->sb_features_ro_compat |= XFS_SB_FEAT_RO_COMPAT_FINOBT;
+ new_sb->sb_features_incompat |= XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR;
+ return true;
+}
+
struct check_state {
struct xfs_sb sb;
uint64_t features;
@@ -349,6 +371,8 @@ need_check_fs_free_space(
struct xfs_mount *mp,
const struct check_state *old)
{
+ if (xfs_has_finobt(mp) && !(old->features & XFS_FEAT_FINOBT))
+ return true;
return false;
}

@@ -424,6 +448,8 @@ upgrade_filesystem(
dirty |= set_bigtime(mp, &new_sb);
if (add_nrext64)
dirty |= set_nrext64(mp, &new_sb);
+ if (add_finobt)
+ dirty |= set_finobt(mp, &new_sb);
if (!dirty)
return;

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index bf02beba375..b61af185c38 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -69,6 +69,7 @@ enum c_opt_nums {
CONVERT_INOBTCOUNT,
CONVERT_BIGTIME,
CONVERT_NREXT64,
+ CONVERT_FINOBT,
C_MAX_OPTS,
};

@@ -77,6 +78,7 @@ static char *c_opts[] = {
[CONVERT_INOBTCOUNT] = "inobtcount",
[CONVERT_BIGTIME] = "bigtime",
[CONVERT_NREXT64] = "nrext64",
+ [CONVERT_FINOBT] = "finobt",
[C_MAX_OPTS] = NULL,
};

@@ -336,6 +338,15 @@ process_args(int argc, char **argv)
_("-c nrext64 only supports upgrades\n"));
add_nrext64 = true;
break;
+ case CONVERT_FINOBT:
+ if (!val)
+ do_abort(
+ _("-c finobt requires a parameter\n"));
+ if (strtol(val, NULL, 0) != 1)
+ do_abort(
+ _("-c finobt only supports upgrades\n"));
+ add_finobt = true;
+ break;
default:
unknown('c', val);
break;