From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Move the extra AG geometry fields out of scrub and into the libfrog code so that we can consolidate the geoemtry code in one place. Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx> Reviewed-by: Allison Collins <allison.henderson@xxxxxxxxxx> --- include/fsgeom.h | 12 ++++++++++++ libfrog/fsgeom.c | 13 ++++++++++++- scrub/fscounters.c | 4 ++-- scrub/inodes.c | 4 ++-- scrub/phase1.c | 5 ----- scrub/phase3.c | 6 +++--- scrub/phase5.c | 4 ++-- scrub/phase6.c | 2 +- scrub/phase7.c | 6 +++--- scrub/xfs_scrub.h | 4 ---- 10 files changed, 37 insertions(+), 23 deletions(-) diff --git a/include/fsgeom.h b/include/fsgeom.h index 26f93b3c..7837c700 100644 --- a/include/fsgeom.h +++ b/include/fsgeom.h @@ -20,6 +20,18 @@ struct xfs_fd { /* filesystem geometry */ struct xfs_fsop_geom fsgeom; + + /* log2 of sb_agblocks (rounded up) */ + unsigned int agblklog; + + /* log2 of sb_blocksize */ + unsigned int blocklog; + + /* log2 of sb_inodesize */ + unsigned int inodelog; + + /* log2 of sb_inopblock */ + unsigned int inopblog; }; /* Static initializers */ diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c index 9513faf5..b7e2b2f8 100644 --- a/libfrog/fsgeom.c +++ b/libfrog/fsgeom.c @@ -4,6 +4,7 @@ */ #include "libxfs.h" #include "fsgeom.h" +#include "libfrog.h" void xfs_report_geom( @@ -101,7 +102,17 @@ int xfd_prepare_geometry( struct xfs_fd *xfd) { - return xfrog_geometry(xfd->fd, &xfd->fsgeom); + int ret; + + ret = xfrog_geometry(xfd->fd, &xfd->fsgeom); + if (ret) + return ret; + + xfd->agblklog = log2_roundup(xfd->fsgeom.agblocks); + xfd->blocklog = highbit32(xfd->fsgeom.blocksize); + xfd->inodelog = highbit32(xfd->fsgeom.inodesize); + xfd->inopblog = xfd->blocklog - xfd->inodelog; + return 0; } /* diff --git a/scrub/fscounters.c b/scrub/fscounters.c index f18d0e19..ac898764 100644 --- a/scrub/fscounters.c +++ b/scrub/fscounters.c @@ -91,8 +91,8 @@ xfs_count_ag_inodes( minor(ctx->fsinfo.fs_datadev), agno); - ag_ino = (__u64)agno << (ctx->inopblog + ctx->agblklog); - next_ag_ino = (__u64)(agno + 1) << (ctx->inopblog + ctx->agblklog); + ag_ino = (__u64)agno << (ctx->mnt.inopblog + ctx->mnt.agblklog); + next_ag_ino = (__u64)(agno + 1) << (ctx->mnt.inopblog + ctx->mnt.agblklog); moveon = xfs_count_inodes_range(ctx, descr, ag_ino, next_ag_ino - 1, &ci->counters[agno]); diff --git a/scrub/inodes.c b/scrub/inodes.c index 08f3d847..873ad425 100644 --- a/scrub/inodes.c +++ b/scrub/inodes.c @@ -228,8 +228,8 @@ xfs_scan_ag_inodes( minor(ctx->fsinfo.fs_datadev), agno); - ag_ino = (__u64)agno << (ctx->inopblog + ctx->agblklog); - next_ag_ino = (__u64)(agno + 1) << (ctx->inopblog + ctx->agblklog); + ag_ino = (__u64)agno << (ctx->mnt.inopblog + ctx->mnt.agblklog); + next_ag_ino = (__u64)(agno + 1) << (ctx->mnt.inopblog + ctx->mnt.agblklog); moveon = xfs_iterate_inodes_range(ctx, descr, ctx->fshandle, ag_ino, next_ag_ino - 1, si->fn, si->arg); diff --git a/scrub/phase1.c b/scrub/phase1.c index 10dde8e8..6879cc33 100644 --- a/scrub/phase1.c +++ b/scrub/phase1.c @@ -140,11 +140,6 @@ _("Does not appear to be an XFS filesystem!")); return false; } - ctx->agblklog = log2_roundup(ctx->mnt.fsgeom.agblocks); - ctx->blocklog = highbit32(ctx->mnt.fsgeom.blocksize); - ctx->inodelog = highbit32(ctx->mnt.fsgeom.inodesize); - ctx->inopblog = ctx->blocklog - ctx->inodelog; - error = path_to_fshandle(ctx->mntpoint, &ctx->fshandle, &ctx->fshandle_len); if (error) { diff --git a/scrub/phase3.c b/scrub/phase3.c index a42d8213..579e08c3 100644 --- a/scrub/phase3.c +++ b/scrub/phase3.c @@ -52,8 +52,8 @@ xfs_scrub_inode_vfs_error( xfs_agino_t agino; int old_errno = errno; - agno = bstat->bs_ino / (1ULL << (ctx->inopblog + ctx->agblklog)); - agino = bstat->bs_ino % (1ULL << (ctx->inopblog + ctx->agblklog)); + agno = bstat->bs_ino / (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog)); + agino = bstat->bs_ino % (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog)); snprintf(descr, DESCR_BUFSZ, _("inode %"PRIu64" (%u/%u)"), (uint64_t)bstat->bs_ino, agno, agino); errno = old_errno; @@ -77,7 +77,7 @@ xfs_scrub_inode( int error; xfs_action_list_init(&alist); - agno = bstat->bs_ino / (1ULL << (ctx->inopblog + ctx->agblklog)); + agno = bstat->bs_ino / (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog)); background_sleep(); /* Try to open the inode to pin it. */ diff --git a/scrub/phase5.c b/scrub/phase5.c index 748885d4..36ec27b3 100644 --- a/scrub/phase5.c +++ b/scrub/phase5.c @@ -239,8 +239,8 @@ xfs_scrub_connections( int fd = -1; int error; - agno = bstat->bs_ino / (1ULL << (ctx->inopblog + ctx->agblklog)); - agino = bstat->bs_ino % (1ULL << (ctx->inopblog + ctx->agblklog)); + agno = bstat->bs_ino / (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog)); + agino = bstat->bs_ino % (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog)); snprintf(descr, DESCR_BUFSZ, _("inode %"PRIu64" (%u/%u)"), (uint64_t)bstat->bs_ino, agno, agino); background_sleep(); diff --git a/scrub/phase6.c b/scrub/phase6.c index e5a0b3c1..48971270 100644 --- a/scrub/phase6.c +++ b/scrub/phase6.c @@ -547,7 +547,7 @@ xfs_estimate_verify_work( if (!moveon) return moveon; - *items = ((d_blocks - d_bfree) + (r_blocks - r_bfree)) << ctx->blocklog; + *items = ((d_blocks - d_bfree) + (r_blocks - r_bfree)) << ctx->mnt.blocklog; *nr_threads = disk_heads(ctx->datadev); *rshift = 20; return moveon; diff --git a/scrub/phase7.c b/scrub/phase7.c index 13959ca8..41a77356 100644 --- a/scrub/phase7.c +++ b/scrub/phase7.c @@ -148,11 +148,11 @@ xfs_scan_summary( * filesystem treats them as "free", but since we scanned * them, we'll consider them used. */ - d_bfree -= totalcount.agbytes >> ctx->blocklog; + d_bfree -= totalcount.agbytes >> ctx->mnt.blocklog; /* Report on what we found. */ - used_data = (d_blocks - d_bfree) << ctx->blocklog; - used_rt = (r_blocks - r_bfree) << ctx->blocklog; + used_data = (d_blocks - d_bfree) << ctx->mnt.blocklog; + used_rt = (r_blocks - r_bfree) << ctx->mnt.blocklog; used_files = f_files - f_free; stat_data = totalcount.dbytes; stat_rt = totalcount.rbytes; diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h index 2af106ea..6178f324 100644 --- a/scrub/xfs_scrub.h +++ b/scrub/xfs_scrub.h @@ -63,10 +63,6 @@ struct scrub_ctx { /* XFS specific geometry */ struct fs_path fsinfo; - unsigned int agblklog; - unsigned int blocklog; - unsigned int inodelog; - unsigned int inopblog; void *fshandle; size_t fshandle_len;