Commit 531bffec authored by David Sterba's avatar David Sterba Committed by Wen Zhiwei
Browse files

btrfs: relocation: return bool from btrfs_should_ignore_reloc_root 

stable inclusion
from stable-v6.6.55
commit 5ae94c639777bfad56535b70de031677cc3163da
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB0MX4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5ae94c639777bfad56535b70de031677cc3163da



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

[ Upstream commit 32f2abca380fedc60f7a8d3288e4c9586672e207 ]

btrfs_should_ignore_reloc_root() is a predicate so it should return
bool.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Stable-dep-of: db7e68b522c0 ("btrfs: drop the backref cache during relocation if we commit")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 07ff1d6f

fs/btrfs/relocation.c

+9 −10
Original line number Diff line number Diff line
@@ -329,31 +329,30 @@ static bool have_reloc_root(struct btrfs_root *root) 
	return true;

}



int btrfs_should_ignore_reloc_root(struct btrfs_root *root)

bool btrfs_should_ignore_reloc_root(struct btrfs_root *root)

{

	struct btrfs_root *reloc_root;



	if (!test_bit(BTRFS_ROOT_SHAREABLE, &root->state))

		return 0;

		return false;



	/* This root has been merged with its reloc tree, we can ignore it */

	if (reloc_root_is_dead(root))

		return 1;

		return true;



	reloc_root = root->reloc_root;

	if (!reloc_root)

		return 0;

		return false;



	if (btrfs_header_generation(reloc_root->commit_root) ==

	    root->fs_info->running_transaction->transid)

		return 0;

		return false;

	/*

	 * if there is reloc tree and it was created in previous

	 * transaction backref lookup can find the reloc tree,

	 * so backref node for the fs tree root is useless for

	 * relocation.

	 * If there is reloc tree and it was created in previous transaction

	 * backref lookup can find the reloc tree, so backref node for the fs

	 * tree root is useless for relocation.

	 */

	return 1;

	return true;

}



/*

fs/btrfs/relocation.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans, 
			      struct btrfs_pending_snapshot *pending);

int btrfs_should_cancel_balance(struct btrfs_fs_info *fs_info);

struct btrfs_root *find_reloc_root(struct btrfs_fs_info *fs_info, u64 bytenr);

int btrfs_should_ignore_reloc_root(struct btrfs_root *root);

bool btrfs_should_ignore_reloc_root(struct btrfs_root *root);

u64 btrfs_get_reloc_bg_bytenr(struct btrfs_fs_info *fs_info);



#endif