diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-06-08 15:47:49 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-08-06 15:01:57 +0200 |
| commit | f3c710111694db1678c9af5d0ad913c8d1706444 (patch) | |
| tree | 9edb2faf17e704e1cf6e6b0af2640360af2c9126 | |
| parent | 6a4ae9bd851e996e22c98ca69a33ff49d8872f9f (diff) | |
btrfs-progs: check: Drop trans/root arguments from free_extent_hook
They are not really needed, what free_extent_hook wants is really a
pointer to fs_info so give it to it directly. This is in preparation
of delayed refs code.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | check/main.c | 5 | ||||
| -rw-r--r-- | ctree.h | 3 | ||||
| -rw-r--r-- | extent-tree.c | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/check/main.c b/check/main.c index 8db300ab..7c0e5a51 100644 --- a/check/main.c +++ b/check/main.c @@ -6275,8 +6275,7 @@ static int add_root_to_pending(struct extent_buffer *buf, * we're tracking for repair. This hook makes sure we * remove any backrefs for blocks as we are fixing them. */ -static int free_extent_hook(struct btrfs_trans_handle *trans, - struct btrfs_root *root, +static int free_extent_hook(struct btrfs_fs_info *fs_info, u64 bytenr, u64 num_bytes, u64 parent, u64 root_objectid, u64 owner, u64 offset, int refs_to_drop) @@ -6284,7 +6283,7 @@ static int free_extent_hook(struct btrfs_trans_handle *trans, struct extent_record *rec; struct cache_extent *cache; int is_data; - struct cache_tree *extent_cache = root->fs_info->fsck_extent_cache; + struct cache_tree *extent_cache = fs_info->fsck_extent_cache; is_data = owner >= BTRFS_FIRST_FREE_OBJECTID; cache = lookup_cache_extent(extent_cache, bytenr, num_bytes); @@ -1143,8 +1143,7 @@ struct btrfs_fs_info { int transaction_aborted; - int (*free_extent_hook)(struct btrfs_trans_handle *trans, - struct btrfs_root *root, + int (*free_extent_hook)(struct btrfs_fs_info *fs_info, u64 bytenr, u64 num_bytes, u64 parent, u64 root_objectid, u64 owner, u64 offset, int refs_to_drop); diff --git a/extent-tree.c b/extent-tree.c index 6e7a1932..9132cb3f 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -2163,8 +2163,8 @@ static int __free_extent(struct btrfs_trans_handle *trans, int skinny_metadata = btrfs_fs_incompat(extent_root->fs_info, SKINNY_METADATA); - if (root->fs_info->free_extent_hook) { - root->fs_info->free_extent_hook(trans, root, bytenr, num_bytes, + if (trans->fs_info->free_extent_hook) { + trans->fs_info->free_extent_hook(trans->fs_info, bytenr, num_bytes, parent, root_objectid, owner_objectid, owner_offset, refs_to_drop); |