Commit 7fd1e6f6 authored by David Sterba's avatar David Sterba Committed by Zheng Zengkai
Browse files

btrfs: fix backport of 2175bf57dc952 in 5.10.13 

stable inclusion
from stable-5.10.18
commit aa0fd921d2079dd5fd87466f087a44eae8844217
bugzilla: 50148

--------------------------------

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.

Link: https://lore.kernel.org/linux-btrfs/20210219111741.95DD.409509F4@e16-tech.com


Reported-by: default avatarWang Yugui <wangyugui@e16-tech.com>
CC: stable@vger.kernel.org # 5.10.13+
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent 6b0b5ec5

fs/btrfs/ctree.h

+3 −3
Original line number Diff line number Diff line
@@ -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,

};



/*