diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2017-07-13 11:51:25 -0500 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2017-07-13 11:51:25 -0500 |
| commit | fc22d6ab04c45d04cfe70770ef69224e062ac4a6 (patch) | |
| tree | 356332a8d7956ba58b0ef4364ffb59d30146ba08 | |
| parent | 1d7d0b1dd9ac5ce23a5404eed2852792fd78c04b (diff) | |
| download | xfsprogs-dev-fc22d6ab04c45d04cfe70770ef69224e062ac4a6.tar.gz | |
mkfs: set agblklog when we're verifying minimum log size
In e5cc9d560a ("mkfs: set agsize prior to calculating minimum log
size"), we set the ag size in the superblock structure so that we can
calculate the maximum btree height correctly. The btree heights are
used to calculate transaction reservation sizes; these sizes are used to
compute the minimum log length; and the minimum log length is checked by
the kernel.
Unfortunately, I didn't realize that some of the btree sizing functions
also depend on the agblklog (log2 of the ag size), so we've been
underestimating the minimum log length allowable, which results in mkfs
formatting filesystems that the kernel refuses to mount.
This can be trivially reproduced by formatting a small (~800M) volume
with rmap and reflink turned on.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | mkfs/maxtrres.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkfs/maxtrres.c b/mkfs/maxtrres.c index fba7818ab1..69ec67a92e 100644 --- a/mkfs/maxtrres.c +++ b/mkfs/maxtrres.c @@ -54,6 +54,7 @@ max_trans_res( sbp->sb_blocklog = blocklog; sbp->sb_blocksize = 1 << blocklog; sbp->sb_agblocks = agsize; + sbp->sb_agblklog = (uint8_t)libxfs_log2_roundup((unsigned int)agsize); sbp->sb_inodelog = inodelog; sbp->sb_inopblog = blocklog - inodelog; sbp->sb_inodesize = 1 << inodelog; |