From: Dave Chinner <dchinner@xxxxxxxxxx>
Signed-Off-By: Dave Chinner <dchinner@xxxxxxxxxx>
---
mkfs/xfs_mkfs.c | 65 +++++++++++++++++++++++++--------------------------------
1 file changed, 29 insertions(+), 36 deletions(-)
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 1ab9e98b8b02..ae6514cb0a1f 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1055,28 +1055,6 @@ validate_log_size(uint64_t logblocks, int blocklog, int min_logblocks)
}
}
-static int
-calc_default_imaxpct(
- int blocklog,
- uint64_t dblocks)
-{
- /*
- * This returns the % of the disk space that is used for
- * inodes, it changes relatively to the FS size:
- * - over 50 TB, use 1%,
- * - 1TB - 50 TB, use 5%,
- * - under 1 TB, use XFS_DFL_IMAXIMUM_PCT (25%).
- */
-
- if (dblocks < TERABYTES(1, blocklog)) {
- return XFS_DFL_IMAXIMUM_PCT;
- } else if (dblocks < TERABYTES(50, blocklog)) {
- return 5;
- }
-
- return 1;
-}
-
static void
validate_ag_geometry(
int blocklog,
@@ -2866,6 +2844,31 @@ validate:
}
static void
+calculate_imaxpct(
+ struct mkfs_params *cfg,
+ struct cli_params *cli)
+{
+ cfg->imaxpct = cli->imaxpct;
+ if (cfg->imaxpct)
+ return;
+
+ /*
+ * This returns the % of the disk space that is used for
+ * inodes, it changes relatively to the FS size:
+ * - over 50 TB, use 1%,
+ * - 1TB - 50 TB, use 5%,
+ * - under 1 TB, use XFS_DFL_IMAXIMUM_PCT (25%).
+ */
+
+ if (cfg->dblocks < TERABYTES(1, cfg->blocklog))
+ cfg->imaxpct = XFS_DFL_IMAXIMUM_PCT;
+ else if (cfg->dblocks < TERABYTES(50, cfg->blocklog))
+ cfg->imaxpct = 5;
+ else
+ cfg->imaxpct = 1;
+}
+
+static void
print_mkfs_cfg(
struct mkfs_params *cfg,
char *dfile,
@@ -3505,7 +3508,6 @@ main(
int force_overwrite;
struct fsxattr fsx;
int imaxpct;
- int imflag;
int inodelog;
int inopblock;
int isize;
@@ -3601,7 +3603,6 @@ main(
cli.loginternal = 1; /* internal by default */
agsize = dblocks = 0;
- imflag = 0;
laflag = lsflag = 0;
loginternal = 1;
logagno = logblocks = rtblocks = rtextblocks = 0;
@@ -3624,6 +3625,7 @@ main(
force_overwrite = 1;
break;
case 'b':
+ case 'i':
case 'n':
case 'r':
case 's':
@@ -3638,14 +3640,6 @@ main(
fsx.fsx_extsize = cli.fsx.fsx_extsize;
/* end temp don't break code */
break;
- case 'i':
- parse_subopts(c, optarg, &cli);
-
- /* temp don't break code */
- imaxpct = cli.imaxpct;
- imflag = cli_opt_set(&iopts, I_MAXPCT);
- /* end temp don't break code */
- break;
case 'l':
parse_subopts(c, optarg, &cli);
@@ -3746,6 +3740,8 @@ main(
calculate_initial_ag_geometry(&cfg, &cli);
align_ag_geometry(&cfg);
+ calculate_imaxpct(&cfg, &cli);
+
/* temp don't break code */
sectorsize = cfg.sectorsize;
sectorlog = cfg.sectorlog;
@@ -3771,12 +3767,9 @@ main(
lsunit = cfg.lsunit;
agsize = cfg.agsize;
agcount = cfg.agcount;
+ imaxpct = cfg.imaxpct;
/* end temp don't break code */
-
- if (!imflag)
- imaxpct = calc_default_imaxpct(blocklog, dblocks);
-
min_logblocks = max_trans_res(agsize,
sb_feat.crcs_enabled, sb_feat.dir_version,
sectorlog, blocklog, inodelog, dirblocklog,
--
2.13.3
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
