Commit e3799e65 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: make btrfs_free_log() and btrfs_free_log_root_tree() return void 



These functions never fail, always return success (0) and none of the
callers care about their return values. Change their return type from int
to void.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b48c980b

fs/btrfs/tree-log.c

+2 −5
Original line number Diff line number Diff line
@@ -3681,25 +3681,22 @@ static void free_log_tree(struct btrfs_trans_handle *trans, 
 * free all the extents used by the tree log.  This should be called

 * at commit time of the full transaction

 */

int btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root)

void btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root)

{

	if (root->log_root) {

		free_log_tree(trans, root->log_root);

		root->log_root = NULL;

		clear_bit(BTRFS_ROOT_HAS_LOG_TREE, &root->state);

	}

	return 0;

}



int btrfs_free_log_root_tree(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info)

void btrfs_free_log_root_tree(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info)

{

	if (fs_info->log_root_tree) {

		free_log_tree(trans, fs_info->log_root_tree);

		fs_info->log_root_tree = NULL;

		clear_bit(BTRFS_ROOT_HAS_LOG_TREE, &fs_info->tree_root->state);

	}

	return 0;

}



static bool mark_inode_as_not_logged(const struct btrfs_trans_handle *trans,

fs/btrfs/tree-log.h

+2 −3
Original line number Diff line number Diff line
@@ -71,9 +71,8 @@ static inline int btrfs_need_log_full_commit(struct btrfs_trans_handle *trans) 


int btrfs_sync_log(struct btrfs_trans_handle *trans,

		   struct btrfs_root *root, struct btrfs_log_ctx *ctx);

int btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root);

int btrfs_free_log_root_tree(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info);

void btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root);

void btrfs_free_log_root_tree(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info);

int btrfs_recover_log_trees(struct btrfs_root *tree_root);

int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans,

			  struct dentry *dentry,