From: fdmanana@kernel.org
To: linux-btrfs@vger.kernel.org
Subject: [PATCH] Btrfs-progs: mkfs, fix metadata corruption when using mixed mode
Date: Thu, 25 Jul 2019 11:27:17 +0100 [thread overview]
Message-ID: <20190725102717.11688-1-fdmanana@kernel.org> (raw)
From: Filipe Manana <fdmanana@suse.com>
When creating a filesystem with mixed block groups, we are creating two
space info objects to track used/reserved/pinned space, one only for data
and another one only for metadata.
This is making fstests test case generic/416 fail, with btrfs' check
reporting over an hundred errors about bad extents:
(...)
bad extent [17186816, 17190912), type mismatch with chunk
bad extent [17195008, 17199104), type mismatch with chunk
bad extent [17203200, 17207296), type mismatch with chunk
(...)
Because, surprisingly, this results in block groups that do not have the
BTRFS_BLOCK_GROUP_DATA flag set but have data extents allocated in them.
This is a regression introduced in btrfs-progs v5.2.
So fix this by making sure we only create one space info object, for both
metadata and data, when mixed block groups are enabled.
Fixes: c31edf610cbe1e ("btrfs-progs: Fix false ENOSPC alert by tracking used space correctly")
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
mkfs/main.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/mkfs/main.c b/mkfs/main.c
index 8dbec071..971cb395 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -64,18 +64,17 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed,
struct btrfs_fs_info *fs_info = root->fs_info;
struct btrfs_trans_handle *trans;
struct btrfs_space_info *sinfo;
+ u64 flags = BTRFS_BLOCK_GROUP_METADATA;
u64 bytes_used;
u64 chunk_start = 0;
u64 chunk_size = 0;
int ret;
+ if (mixed)
+ flags |= BTRFS_BLOCK_GROUP_DATA;
+
/* Create needed space info to trace extents reservation */
- ret = update_space_info(fs_info, BTRFS_BLOCK_GROUP_METADATA,
- 0, 0, &sinfo);
- if (ret < 0)
- return ret;
- ret = update_space_info(fs_info, BTRFS_BLOCK_GROUP_DATA,
- 0, 0, &sinfo);
+ ret = update_space_info(fs_info, flags, 0, 0, &sinfo);
if (ret < 0)
return ret;
@@ -149,6 +148,13 @@ static int create_data_block_groups(struct btrfs_trans_handle *trans,
int ret = 0;
if (!mixed) {
+ struct btrfs_space_info *sinfo;
+
+ ret = update_space_info(fs_info, BTRFS_BLOCK_GROUP_DATA,
+ 0, 0, &sinfo);
+ if (ret < 0)
+ return ret;
+
ret = btrfs_alloc_chunk(trans, fs_info,
&chunk_start, &chunk_size,
BTRFS_BLOCK_GROUP_DATA);
--
2.11.0
next reply other threads:[~2019-07-25 10:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 10:27 fdmanana [this message]
2019-07-25 12:06 ` [PATCH] Btrfs-progs: mkfs, fix metadata corruption when using mixed mode Qu Wenruo
2019-07-25 18:03 ` 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=20190725102717.11688-1-fdmanana@kernel.org \
--to=fdmanana@kernel.org \
--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