From: "Darrick J. Wong" <djwong@kernel.org>
To: sandeen@sandeen.net, djwong@kernel.org
Cc: Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org
Subject: [PATCH 2/2] xfs_io: don't count fsmaps before querying fsmaps
Date: Wed, 28 Jul 2021 14:16:18 -0700 [thread overview]
Message-ID: <162750697870.45811.17448937976740124721.stgit@magnolia> (raw)
In-Reply-To: <162750696777.45811.13113252405327690016.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
There's a bunch of code in fsmap.c that tries to count the GETFSMAP
records so that it can size the fsmap array appropriately for the
GETFSMAP call. It's pointless to iterate the entire result set /twice/
(unlike the bmap command where the extent count is actually stored in
the fs metadata), so get rid of the duplicate walk.
In other words: Iterate over the records using the default chunk size
instead of doing one call to find the size and doing a giant allocation
and GETFSMAP call.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
io/fsmap.c | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/io/fsmap.c b/io/fsmap.c
index 9f179fa8..f540a7c0 100644
--- a/io/fsmap.c
+++ b/io/fsmap.c
@@ -372,13 +372,11 @@ fsmap_f(
char **argv)
{
struct fsmap *p;
- struct fsmap_head *nhead;
struct fsmap_head *head;
struct fsmap *l, *h;
struct xfs_fsop_geom fsgeo;
long long start = 0;
long long end = -1;
- int nmap_size;
int map_size;
int nflag = 0;
int vflag = 0;
@@ -492,34 +490,6 @@ fsmap_f(
h->fmr_flags = UINT_MAX;
h->fmr_offset = ULLONG_MAX;
- /* Count mappings */
- if (!nflag) {
- head->fmh_count = 0;
- i = ioctl(file->fd, FS_IOC_GETFSMAP, head);
- if (i < 0) {
- fprintf(stderr, _("%s: xfsctl(XFS_IOC_GETFSMAP)"
- " iflags=0x%x [\"%s\"]: %s\n"),
- progname, head->fmh_iflags, file->name,
- strerror(errno));
- exitcode = 1;
- free(head);
- return 0;
- }
- if (head->fmh_entries > map_size + 2) {
- map_size = 11ULL * head->fmh_entries / 10;
- nmap_size = map_size > (1 << 24) ? (1 << 24) : map_size;
- nhead = realloc(head, fsmap_sizeof(nmap_size));
- if (nhead == NULL) {
- fprintf(stderr,
- _("%s: cannot realloc %zu bytes\n"),
- progname, fsmap_sizeof(nmap_size));
- } else {
- head = nhead;
- map_size = nmap_size;
- }
- }
- }
-
/*
* If this is an XFS filesystem, remember the data device.
* (We report AG number/block for data device extents on XFS).
next prev parent reply other threads:[~2021-07-28 21:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 21:16 [PATCHSET 0/2] xfs_io: small fixes to fsmap command Darrick J. Wong
2021-07-28 21:16 ` [PATCH 1/2] xfs_io: only print the header once when dumping fsmap in csv format Darrick J. Wong
2021-07-28 21:16 ` Darrick J. Wong [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-07-03 2:58 [PATCHSET 0/2] xfs_io: small fixes to fsmap command Darrick J. Wong
2021-07-03 2:58 ` [PATCH 2/2] xfs_io: don't count fsmaps before querying fsmaps Darrick J. Wong
2021-07-05 15:25 ` Christoph Hellwig
2021-07-06 18:30 ` 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=162750697870.45811.17448937976740124721.stgit@magnolia \
--to=djwong@kernel.org \
--cc=hch@lst.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).