From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 2/4] btrfs: Add incompat flags check for btrfs_check_super_valid()
Date: Tue, 24 Apr 2018 12:48:07 +0800 [thread overview]
Message-ID: <20180424044809.29838-3-wqu@suse.com> (raw)
In-Reply-To: <20180424044809.29838-1-wqu@suse.com>
Although we have already checked incompat flags manually before really
mounting it, we could still enhance btrfs_check_super_valid() to check
incompat flags for later write time super block validation check.
This patch adds such incompat flags check for btrfs_check_super_valid(),
currently it won't be triggered, but provides the basis for later write
time check.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/disk-io.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 23b5c90cdbb2..3968f7ff8de2 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4104,6 +4104,19 @@ static int btrfs_validate_super(struct btrfs_fs_info *fs_info)
ret = -EINVAL;
}
+ /*
+ * Before calling btrfs_check_super_valid() we have already checked
+ * incompat flags. So if we developr new incompat flags, it's must be
+ * some corruption.
+ */
+ if (btrfs_super_incompat_flags(sb) & ~BTRFS_FEATURE_INCOMPAT_SUPP) {
+ btrfs_err(fs_info,
+ "corrupted incompat flags detected 0x%llx, supported 0x%llx",
+ btrfs_super_incompat_flags(sb),
+ BTRFS_FEATURE_INCOMPAT_SUPP);
+ ret = -EINVAL;
+ }
+
/*
* The generation is a global counter, we'll trust it more than the others
* but it's still possible that it's the one that's wrong.
--
2.17.0
next prev parent reply other threads:[~2018-04-24 4:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-24 4:48 [PATCH v2 0/4] btrfs: Add write time super block validation Qu Wenruo
2018-04-24 4:48 ` [PATCH v2 1/4] btrfs: Rename btrfs_check_super_valid() to btrfs_validate_super() Qu Wenruo
2018-04-24 4:48 ` Qu Wenruo [this message]
2018-04-24 10:48 ` [PATCH v2 2/4] btrfs: Add incompat flags check for btrfs_check_super_valid() David Sterba
2018-04-24 11:28 ` Qu Wenruo
2018-04-24 11:30 ` David Sterba
2018-04-24 12:03 ` Qu Wenruo
2018-04-24 4:48 ` [PATCH v2 3/4] btrfs: Add csum type " Qu Wenruo
2018-04-24 4:48 ` [PATCH v2 4/4] btrfs: Do super block verification before writing it to disk Qu Wenruo
2018-04-24 13:14 ` David Sterba
2018-05-10 14:43 ` [PATCH v2 0/4] btrfs: Add write time super block validation David Sterba
2018-05-11 2:57 ` Qu Wenruo
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=20180424044809.29838-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