From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 03/10] libfrog: store more inode and block geometry in struct xfs_fd
Date: Tue, 25 Jun 2019 19:37:09 -0700 [thread overview]
Message-ID: <156151662911.2286979.3134798231235392322.stgit@magnolia> (raw)
In-Reply-To: <156151660523.2286979.13694849827562044045.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
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@oracle.com>
---
include/xfrog.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/xfrog.h b/include/xfrog.h
index f3808911..d11317f7 100644
--- a/include/xfrog.h
+++ b/include/xfrog.h
@@ -30,6 +30,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 debdece8..bc6158fb 100644
--- a/libfrog/fsgeom.c
+++ b/libfrog/fsgeom.c
@@ -5,6 +5,7 @@
#include "libxfs.h"
#include "fsgeom.h"
#include "xfrog.h"
+#include "libfrog.h"
void
xfs_report_geom(
@@ -94,7 +95,17 @@ int
xfrog_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;
}
/* Release any resources associated with this xfrog structure. */
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 2b8e69d2..d052a21c 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 28eae6fe..fb34c587 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;
next prev parent reply other threads:[~2019-06-26 2:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-26 2:36 [PATCH v4 00/10] xfsprogs-5.1: fix various problems Darrick J. Wong
2019-06-26 2:36 ` [PATCH 01/10] libfrog: refactor online geometry queries Darrick J. Wong
2019-07-12 13:14 ` Eric Sandeen
2019-06-26 2:36 ` [PATCH 02/10] libfrog: introduce xfs_fd to wrap an fd to a file on an xfs filesystem Darrick J. Wong
2019-06-26 2:37 ` Darrick J. Wong [this message]
2019-06-26 2:37 ` [PATCH 04/10] libfrog: create online fs geometry converters Darrick J. Wong
2019-06-26 2:37 ` [PATCH 05/10] libfrog: refactor open-coded bulkstat calls Darrick J. Wong
2019-06-26 2:37 ` [PATCH 06/10] libfrog: refactor open-coded INUMBERS calls Darrick J. Wong
2019-06-26 2:37 ` [PATCH 07/10] libxfs-diff: try harder to find the kernel equivalent libxfs files Darrick J. Wong
2019-06-26 2:37 ` [PATCH 08/10] xfs_db: remove db/convert.h Darrick J. Wong
2019-06-26 2:37 ` [PATCH 09/10] xfs_db: add a function to compute btree geometry Darrick J. Wong
2019-06-26 2:37 ` [PATCH 10/10] libxfs: move topology declarations into separate header Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=156151662911.2286979.3134798231235392322.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.