diff options
| author |   Qu Wenruo <wqu@suse.com> | 2019-04-04 14:45:35 +0800 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2019-04-29 19:02:49 +0200 |
| commit | 82fa113fccc41fe5204b4ce35341d69ebde0020f (patch) | |
| tree | 535631ce2f5f8f56ebf7286e897727ab1d105598 /fs/btrfs/tree-log.c | |
| parent | btrfs: extent-tree: Use btrfs_ref to refactor add_pinned_bytes() (diff) | |
| download | linux-dev-82fa113fccc41fe5204b4ce35341d69ebde0020f.tar.xz linux-dev-82fa113fccc41fe5204b4ce35341d69ebde0020f.zip | |
btrfs: extent-tree: Use btrfs_ref to refactor btrfs_inc_extent_ref()
Use the new btrfs_ref structure and replace parameter list to clean up
the usage of owner and level to distinguish the extent types.
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/btrfs/tree-log.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 75a8e3c78fdb..b94a0cca4ecd 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -705,9 +705,11 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, goto out; if (ins.objectid > 0) { + struct btrfs_ref ref = { 0 }; u64 csum_start; u64 csum_end; LIST_HEAD(ordered_sums); + /* * is this extent already allocated in the extent * allocation tree? If so, just add a reference @@ -715,10 +717,13 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, ret = btrfs_lookup_data_extent(fs_info, ins.objectid, ins.offset); if (ret == 0) { - ret = btrfs_inc_extent_ref(trans, root, - ins.objectid, ins.offset, - 0, root->root_key.objectid, + btrfs_init_generic_ref(&ref, + BTRFS_ADD_DELAYED_REF, + ins.objectid, ins.offset, 0); + btrfs_init_data_ref(&ref, + root->root_key.objectid, key->objectid, offset); + ret = btrfs_inc_extent_ref(trans, &ref); if (ret) goto out; } else { |