From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2.1 2/3] btrfs-progs: check/original: Check and repair root item geneartion
Date: Mon, 12 Aug 2019 14:34:21 +0800 [thread overview]
Message-ID: <20190812063422.22219-3-wqu@suse.com> (raw)
In-Reply-To: <20190812063422.22219-1-wqu@suse.com>
Add such ability to original mode to fix root generation mismatch, which
can be rejected by kernel.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
check/main.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/check/main.c b/check/main.c
index 98b07fcb58c8..ae3ce13e9466 100644
--- a/check/main.c
+++ b/check/main.c
@@ -3437,8 +3437,10 @@ static int check_fs_root(struct btrfs_root *root,
{
int ret = 0;
int err = 0;
+ bool generation_err = false;
int wret;
int level;
+ u64 super_generation;
struct btrfs_path path;
struct shared_node root_node;
struct root_record *rec;
@@ -3449,6 +3451,23 @@ static int check_fs_root(struct btrfs_root *root,
struct unaligned_extent_rec_t *urec;
struct unaligned_extent_rec_t *tmp;
+ super_generation = btrfs_super_generation(root->fs_info->super_copy);
+ if (btrfs_root_generation(root_item) > super_generation + 1) {
+ error(
+ "invalid generation for root %llu, have %llu expect (0, %llu]",
+ root->root_key.objectid, btrfs_root_generation(root_item),
+ super_generation + 1);
+ generation_err = true;
+ if (repair) {
+ root->node->flags |= EXTENT_BAD_TRANSID;
+ ret = recow_extent_buffer(root, root->node);
+ if (!ret) {
+ printf("Reset generation for root %llu\n",
+ root->root_key.objectid);
+ generation_err = false;
+ }
+ }
+ }
/*
* Reuse the corrupt_block cache tree to record corrupted tree block
*
@@ -3597,6 +3616,8 @@ skip_walking:
free_corrupt_blocks_tree(&corrupt_blocks);
root->fs_info->corrupt_blocks = NULL;
+ if (!ret && generation_err)
+ ret = -1;
return ret;
}
--
2.22.0
next prev parent reply other threads:[~2019-08-12 6:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 6:34 [PATCH v2.1 0/3] btrfs-progs: Check and repair invalid root item generation Qu Wenruo
2019-08-12 6:34 ` [PATCH v2.1 1/3] btrfs-progs: check/lowmem: Check and repair root generation Qu Wenruo
2019-08-12 6:34 ` Qu Wenruo [this message]
2019-08-12 6:34 ` [PATCH v2.1 3/3] btrfs-progs: fsck-tests: Add test case for invalid " Qu Wenruo
2019-08-12 8:22 ` [PATCH v2.1 0/3] btrfs-progs: Check and repair invalid root item generation Nikolay Borisov
2019-08-26 17:07 ` David Sterba
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=20190812063422.22219-3-wqu@suse.com \
--to=wqu@suse.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;
as well as URLs for NNTP newsgroup(s).