From: Josef Bacik <josef@toxicpanda.com>
Date: Fri, 24 Jan 2020 09:32:55 -0500
Git-commit: 81f096edf0472864879e1e5a7f0fdf87ea90fe75
Patch-mainline: 5.7-rc1
References: bsc#1176019
Subject: [PATCH] btrfs: use btrfs_put_fs_root to free roots always
If we are going to track leaked roots we need to free them all the same
way, so don't kfree() roots directly, use btrfs_put_fs_root.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
fs/btrfs/disk-io.c | 30 +++++++++++++++---------------
fs/btrfs/free-space-tree.c | 2 +-
fs/btrfs/qgroup.c | 4 ++--
fs/btrfs/tests/btrfs-tests.c | 2 +-
fs/btrfs/tree-log.c | 8 ++++----
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 76b888728540..5be61619c71b 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1297,7 +1297,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
free_extent_buffer(root->commit_root);
free_extent_buffer(leaf);
}
- kfree(root);
+ btrfs_put_fs_root(root);
return ERR_PTR(ret);
}
@@ -1328,7 +1328,7 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans,
leaf = btrfs_alloc_tree_block(trans, root, 0, BTRFS_TREE_LOG_OBJECTID,
NULL, 0, 0, 0);
if (IS_ERR(leaf)) {
- kfree(root);
+ btrfs_put_fs_root(root);
return ERR_CAST(leaf);
}
@@ -1431,7 +1431,7 @@ struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root,
return root;
find_fail:
- kfree(root);
+ btrfs_put_fs_root(root);
alloc_fail:
root = ERR_PTR(ret);
goto out;
@@ -1527,17 +1527,17 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info)
{
kfree(fs_info->balance_ctl);
kfree(fs_info->delayed_root);
- kfree(fs_info->extent_root);
- kfree(fs_info->tree_root);
- kfree(fs_info->chunk_root);
- kfree(fs_info->dev_root);
- kfree(fs_info->csum_root);
- kfree(fs_info->quota_root);
- kfree(fs_info->uuid_root);
- kfree(fs_info->free_space_root);
+ btrfs_put_fs_root(fs_info->extent_root);
+ btrfs_put_fs_root(fs_info->tree_root);
+ btrfs_put_fs_root(fs_info->chunk_root);
+ btrfs_put_fs_root(fs_info->dev_root);
+ btrfs_put_fs_root(fs_info->csum_root);
+ btrfs_put_fs_root(fs_info->quota_root);
+ btrfs_put_fs_root(fs_info->uuid_root);
+ btrfs_put_fs_root(fs_info->free_space_root);
+ btrfs_put_fs_root(fs_info->fs_root);
kfree(fs_info->super_copy);
kfree(fs_info->super_for_commit);
- btrfs_put_fs_root(fs_info->fs_root);
kvfree(fs_info);
}
@@ -2223,12 +2223,12 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
if (IS_ERR(log_tree_root->node)) {
btrfs_warn(fs_info, "failed to read log tree");
ret = PTR_ERR(log_tree_root->node);
- kfree(log_tree_root);
+ btrfs_put_fs_root(log_tree_root);
return ret;
} else if (!extent_buffer_uptodate(log_tree_root->node)) {
btrfs_err(fs_info, "failed to read log tree");
free_extent_buffer(log_tree_root->node);
- kfree(log_tree_root);
+ btrfs_put_fs_root(log_tree_root);
return -EIO;
}
/* returns with log_tree_root freed on success */
@@ -2237,7 +2237,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
btrfs_handle_fs_error(fs_info, ret,
"Failed to recover log tree");
free_extent_buffer(log_tree_root->node);
- kfree(log_tree_root);
+ btrfs_put_fs_root(log_tree_root);
return ret;
}
diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index 258cb3fae17a..c79804c30b17 100644
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -1253,7 +1253,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
free_extent_buffer(free_space_root->node);
free_extent_buffer(free_space_root->commit_root);
- kfree(free_space_root);
+ btrfs_put_fs_root(free_space_root);
return btrfs_commit_transaction(trans);
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index ff1870ff3474..09fc588ab4bf 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1040,7 +1040,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info)
if (ret) {
free_extent_buffer(quota_root->node);
free_extent_buffer(quota_root->commit_root);
- kfree(quota_root);
+ btrfs_put_fs_root(quota_root);
}
out:
if (ret) {
@@ -1106,7 +1106,7 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info)
free_extent_buffer(quota_root->node);
free_extent_buffer(quota_root->commit_root);
- kfree(quota_root);
+ btrfs_put_fs_root(quota_root);
end_trans:
ret = btrfs_end_transaction(trans);
diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c
index 84fb3fa940a6..5efd8000e65b 100644
--- a/fs/btrfs/tests/btrfs-tests.c
+++ b/fs/btrfs/tests/btrfs-tests.c
@@ -227,7 +227,7 @@ void btrfs_free_dummy_root(struct btrfs_root *root)
/* One for allocate_extent_buffer */
free_extent_buffer(root->node);
}
- kfree(root);
+ btrfs_put_fs_root(root);
}
struct btrfs_block_group *
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 169270c931a9..1776ac466f02 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3289,7 +3289,7 @@ static void free_log_tree(struct btrfs_trans_handle *trans,
clear_extent_bits(&log->dirty_log_pages, 0, (u64)-1,
EXTENT_DIRTY | EXTENT_NEW | EXTENT_NEED_WAIT);
free_extent_buffer(log->node);
- kfree(log);
+ btrfs_put_fs_root(log);
}
/*
@@ -6187,7 +6187,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
log->node->len);
free_extent_buffer(log->node);
free_extent_buffer(log->commit_root);
- kfree(log);
+ btrfs_put_fs_root(log);
if (!ret)
goto next;
@@ -6226,7 +6226,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
btrfs_put_fs_root(wc.replay_dest);
free_extent_buffer(log->node);
free_extent_buffer(log->commit_root);
- kfree(log);
+ btrfs_put_fs_root(log);
if (ret)
goto error;
@@ -6260,7 +6260,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
free_extent_buffer(log_root_tree->node);
log_root_tree->log_root = NULL;
clear_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags);
- kfree(log_root_tree);
+ btrfs_put_fs_root(log_root_tree);
return 0;
error:
--
2.26.2