From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 1/3] btrfs: Add incompat flags check for btrfs_check_super_valid()
Date: Thu, 19 Apr 2018 17:38:14 +0800 [thread overview]
Message-ID: <20180419093816.888-1-wqu@suse.com> (raw)
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 60caa68c3618..ec123158f051 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4104,6 +4104,19 @@ static int btrfs_check_super_valid(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 reply other threads:[~2018-04-19 9:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 9:38 Qu Wenruo [this message]
2018-04-19 9:38 ` [PATCH 2/3] btrfs: Add csum type check for btrfs_check_super_valid() Qu Wenruo
2018-04-19 10:09 ` David Sterba
2018-04-19 10:24 ` Qu Wenruo
2018-04-19 9:38 ` [PATCH 3/3] btrfs: Do super block verification before writing it to disk Qu Wenruo
2018-04-19 10:16 ` David Sterba
2018-04-19 10:32 ` Qu Wenruo
2018-04-20 14:46 ` Anand Jain
2018-04-19 10:59 ` [PATCH 1/3] btrfs: Add incompat flags check for btrfs_check_super_valid() Nikolay Borisov
2018-04-19 11:10 ` Qu Wenruo
2018-04-19 15:31 ` David Sterba
2018-04-19 16:24 ` Nikolay Borisov
2018-04-20 13:04 ` David Sterba
2018-04-20 14:32 ` Anand Jain
2018-04-20 15:15 ` David Sterba
2018-04-21 2:38 ` Anand Jain
2018-04-21 2:43 ` Qu Wenruo
2018-04-21 5:18 ` Anand Jain
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=20180419093816.888-1-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