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

Commit 70922617 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

Btrfs: do not reduce profile in do_chunk_alloc() 



Every caller of do_chunk_alloc() feeds it the reduced allocation
profile, so stop trying to reduce it one more time.  Instead check the
validity of the passed profile.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent ea67176a

fs/btrfs/ctree.h

+18 −0
Original line number Original line Diff line number Diff line
@@ -2536,6 +2536,24 @@ static inline void free_fs_info(struct btrfs_fs_info *fs_info) 
	kfree(fs_info->super_for_commit);

	kfree(fs_info->super_for_commit);

	kfree(fs_info);

	kfree(fs_info);

}

}

/**

 * profile_is_valid - tests whether a given profile is valid and reduced

 * @flags: profile to validate

 * @extended: if true @flags is treated as an extended profile

 */

static inline int profile_is_valid(u64 flags, int extended)

{

	u64 mask = ~BTRFS_BLOCK_GROUP_PROFILE_MASK;



	flags &= ~BTRFS_BLOCK_GROUP_TYPE_MASK;

	if (extended)

		mask &= ~BTRFS_AVAIL_ALLOC_BIT_SINGLE;



	if (flags & mask)

		return 0;

	/* true if zero or exactly one bit set */

	return (flags & (~flags + 1)) == flags;

}





/* root-item.c */

/* root-item.c */

int btrfs_find_root_ref(struct btrfs_root *tree_root,

int btrfs_find_root_ref(struct btrfs_root *tree_root,

fs/btrfs/extent-tree.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3295,7 +3295,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, 
	int wait_for_alloc = 0;

	int wait_for_alloc = 0;

	int ret = 0;

	int ret = 0;





	flags = btrfs_reduce_alloc_profile(extent_root, flags);

	BUG_ON(!profile_is_valid(flags, 0));





	space_info = __find_space_info(extent_root->fs_info, flags);

	space_info = __find_space_info(extent_root->fs_info, flags);

	if (!space_info) {

	if (!space_info) {