Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8213bdc authored by Filipe Manana's avatar Filipe Manana Committed by Chris Mason
Browse files

Btrfs: correctly set profile flags on seqlock retry 



If we had to retry on the profiles seqlock (due to a concurrent write), we
would set bits on the input flags that corresponded both to the current
profile and to previous values of the profile.

Signed-off-by: default avatarFilipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 9ce49a0b

fs/btrfs/extent-tree.c

+3 −1
Original line number Diff line number Diff line
@@ -3543,11 +3543,13 @@ static u64 btrfs_reduce_alloc_profile(struct btrfs_root *root, u64 flags) 
	return extended_to_chunk(flags | tmp);

}



static u64 get_alloc_profile(struct btrfs_root *root, u64 flags)

static u64 get_alloc_profile(struct btrfs_root *root, u64 orig_flags)

{

	unsigned seq;

	u64 flags;



	do {

		flags = orig_flags;

		seq = read_seqbegin(&root->fs_info->profiles_lock);



		if (flags & BTRFS_BLOCK_GROUP_DATA)