From: Josef Bacik <josef@toxicpanda.com>
To: kernel-team@fb.com, linux-btrfs@vger.kernel.org
Subject: [PATCH 3/3] btrfs-progs: fix hole error output in fsck
Date: Tue, 4 Feb 2020 09:32:42 -0500 [thread overview]
Message-ID: <20200204143243.696500-4-josef@toxicpanda.com> (raw)
In-Reply-To: <20200204143243.696500-1-josef@toxicpanda.com>
If we don't find holes in our hole rb tree we'll just assume there's a
gap from 0 to the length of the file and print that out. But this
simply isn't correct, we could have a gap between the last extent and
the isize, or 0 and the start of the first extent. Fix the error
message to tell us exactly where the hole is.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
check/main.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/check/main.c b/check/main.c
index 22f4e24c..71b68ff9 100644
--- a/check/main.c
+++ b/check/main.c
@@ -639,10 +639,20 @@ static void print_inode_error(struct btrfs_root *root, struct inode_record *rec)
hole->start, hole->len);
node = rb_next(node);
}
- if (!found)
- fprintf(stderr, "\tstart: 0, len: %llu\n",
- round_up(rec->isize,
- root->fs_info->sectorsize));
+ if (!found) {
+ u64 start, len;
+ if (rec->extent_end < rec->isize) {
+ start = rec->extent_end;
+ len = round_up(rec->isize,
+ root->fs_info->sectorsize) -
+ start;
+ } else {
+ start = 0;
+ len = rec->extent_start;
+ }
+ fprintf(stderr, "\tstart: %llu, len: %llu\n", start,
+ len);
+ }
}
/* Print dir item with mismatch hash */
--
2.24.1
prev parent reply other threads:[~2020-02-04 14:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 14:32 [PATCH 0/3][v2] Fix btrfs check handling of missing file extents Josef Bacik
2020-02-04 14:32 ` [PATCH 1/3] btrfs-progs: fix check to catch gaps at the start of the file Josef Bacik
2020-02-04 14:32 ` [PATCH 2/3] btrfs-progs: fix lowmem check's handling of holes Josef Bacik
2020-02-04 14:32 ` Josef Bacik [this message]
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=20200204143243.696500-4-josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/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