@@ -42,6 +42,9 @@ struct xfs_fd {
/* log2 of sb_inopblock */
unsigned int inopblog;
+
+ /* bits for agino in inum */
+ unsigned int aginolog;
};
/* Static initializers */
@@ -51,4 +54,50 @@ struct xfs_fd {
int xfrog_prepare_geometry(struct xfs_fd *xfd);
int xfrog_close(struct xfs_fd *xfd);
+/* Convert AG number and AG inode number into fs inode number. */
+static inline uint64_t
+xfrog_agino_to_ino(
+ struct xfs_fd *xfd,
+ uint32_t agno,
+ uint32_t agino)
+{
+ return ((uint64_t)agno << xfd->aginolog) + agino;
+}
+
+/* Convert fs inode number into AG number. */
+static inline uint32_t
+xfrog_ino_to_agno(
+ struct xfs_fd *xfd,
+ uint64_t ino)
+{
+ return ino >> xfd->aginolog;
+}
+
+/* Convert fs inode number into AG inode number. */
+static inline uint32_t
+xfrog_ino_to_agino(
+ struct xfs_fd *xfd,
+ uint64_t ino)
+{
+ return ino & ((1ULL << xfd->aginolog) - 1);
+}
+
+/* Convert fs block number into bytes */
+static inline uint64_t
+xfrog_fsb_to_b(
+ struct xfs_fd *xfd,
+ uint64_t fsb)
+{
+ return fsb << xfd->blocklog;
+}
+
+/* Convert bytes into (rounded down) fs block number */
+static inline uint64_t
+xfrog_b_to_fsbt(
+ struct xfs_fd *xfd,
+ uint64_t bytes)
+{
+ return bytes >> xfd->blocklog;
+}
+
#endif /* __XFROG_H__ */
@@ -105,6 +105,7 @@ xfrog_prepare_geometry(
xfd->blocklog = highbit32(xfd->fsgeom.blocksize);
xfd->inodelog = highbit32(xfd->fsgeom.inodesize);
xfd->inopblog = xfd->blocklog - xfd->inodelog;
+ xfd->aginolog = xfd->agblklog + xfd->inopblog;
return 0;
}
@@ -91,8 +91,8 @@ xfs_count_ag_inodes(
minor(ctx->fsinfo.fs_datadev),
agno);
- ag_ino = (__u64)agno << (ctx->mnt.inopblog + ctx->mnt.agblklog);
- next_ag_ino = (__u64)(agno + 1) << (ctx->mnt.inopblog + ctx->mnt.agblklog);
+ ag_ino = xfrog_agino_to_ino(&ctx->mnt, agno, 0);
+ next_ag_ino = xfrog_agino_to_ino(&ctx->mnt, agno + 1, 0);
moveon = xfs_count_inodes_range(ctx, descr, ag_ino, next_ag_ino - 1,
&ci->counters[agno]);
@@ -228,8 +228,8 @@ xfs_scan_ag_inodes(
minor(ctx->fsinfo.fs_datadev),
agno);
- ag_ino = (__u64)agno << (ctx->mnt.inopblog + ctx->mnt.agblklog);
- next_ag_ino = (__u64)(agno + 1) << (ctx->mnt.inopblog + ctx->mnt.agblklog);
+ ag_ino = xfrog_agino_to_ino(&ctx->mnt, agno, 0);
+ next_ag_ino = xfrog_agino_to_ino(&ctx->mnt, agno + 1, 0);
moveon = xfs_iterate_inodes_range(ctx, descr, ctx->fshandle, ag_ino,
next_ag_ino - 1, si->fn, si->arg);
@@ -52,8 +52,8 @@ xfs_scrub_inode_vfs_error(
xfs_agino_t agino;
int old_errno = errno;
- agno = bstat->bs_ino / (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog));
- agino = bstat->bs_ino % (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog));
+ agno = xfrog_ino_to_agno(&ctx->mnt, bstat->bs_ino);
+ agino = xfrog_ino_to_agino(&ctx->mnt, bstat->bs_ino);
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->mnt.inopblog + ctx->mnt.agblklog));
+ agno = xfrog_ino_to_agno(&ctx->mnt, bstat->bs_ino);
background_sleep();
/* Try to open the inode to pin it. */
@@ -239,8 +239,8 @@ xfs_scrub_connections(
int fd = -1;
int error;
- agno = bstat->bs_ino / (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog));
- agino = bstat->bs_ino % (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog));
+ agno = xfrog_ino_to_agno(&ctx->mnt, bstat->bs_ino);
+ agino = xfrog_ino_to_agino(&ctx->mnt, bstat->bs_ino);
snprintf(descr, DESCR_BUFSZ, _("inode %"PRIu64" (%u/%u)"),
(uint64_t)bstat->bs_ino, agno, agino);
background_sleep();
@@ -547,7 +547,8 @@ xfs_estimate_verify_work(
if (!moveon)
return moveon;
- *items = ((d_blocks - d_bfree) + (r_blocks - r_bfree)) << ctx->mnt.blocklog;
+ *items = xfrog_fsb_to_b(&ctx->mnt,
+ (d_blocks - d_bfree) + (r_blocks - r_bfree));
*nr_threads = disk_heads(ctx->datadev);
*rshift = 20;
return moveon;
@@ -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->mnt.blocklog;
+ d_bfree -= xfrog_b_to_fsbt(&ctx->mnt, totalcount.agbytes);
/* Report on what we found. */
- used_data = (d_blocks - d_bfree) << ctx->mnt.blocklog;
- used_rt = (r_blocks - r_bfree) << ctx->mnt.blocklog;
+ used_data = xfrog_fsb_to_b(&ctx->mnt, d_blocks - d_bfree);
+ used_rt = xfrog_fsb_to_b(&ctx->mnt, r_blocks - r_bfree);
used_files = f_files - f_free;
stat_data = totalcount.dbytes;
stat_rt = totalcount.rbytes;