btrfs: fix backport of 2175bf57dc952 in 5.10.13
Subsystems (2)
David Sterba
maintainerPATCH 1/1 btrfs: fix backport of 2175bf57dc952 in 5.10.13
From: David Sterba <[email protected]>
There's a mistake in backport of upstream commit 2175bf57dc95 ("btrfs:
fix possible free space tree corruption with online conversion") as 5.10.13 commit 2175bf57dc95.
The enum value BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED has been added to the wrong enum set, colliding with value of BTRFS_FS_QUOTA_ENABLE. This could cause problems during the tree conversion, where the quotas wouldn't be set up properly but the related code executed anyway due to the bit set.
Reported-by Wang Yugui <[email protected]>
CC [email protected] # 5.10.13+
Signed-off-by David Sterba <[email protected]>
--- fs/btrfs/ctree.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/btrfs/ctree.h +3 -3
@@ -146,9 +146,6 @@ enum {BTRFS_FS_STATE_DEV_REPLACING ,/* The btrfs_fs_info created for self-tests */ BTRFS_FS_STATE_DUMMY_FS_INFO, - -/* Indicate that we can't trust the free space tree for caching yet */ - BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, };#define BTRFS_BACKREF_REV_MAX 256
@@ -562,6 +559,9 @@ enum {/* Indicate that the discard workqueue can service discards. */ BTRFS_FS_DISCARD_RUNNING , + +/* Indicate that we can't trust the free space tree for caching yet */ + BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, };/*
Signature · 1 line
2.29.2