diff options
| author | Qu Wenruo <quwenruo.btrfs@gmx.com> | 2017-09-11 15:36:06 +0900 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-09-25 15:17:48 +0200 |
| commit | 02b58051e60658abb0387bec7063e77d2941923b (patch) | |
| tree | c9df3ed9895d12ca40b19dbf88bdbdd798fc08dc /volumes.c | |
| parent | 3efd322db238abcee7f8dddd6d5af7f69fc3fac4 (diff) | |
btrfs-progs: Refactor find_next_chunk to get rid of parameter root and objectid
Function find_next_chunk() is used to find next chunk start position,
which should only do search on chunk tree and objectid is set to
BTRFS_FIRST_CHUNK_TREE_OBJECTID.
So refactor the parameter list to get rid of @root, which should be
obtained from fs_info->chunk_root, and @objectid, which is set to
BTRFS_FIRST_CHUNK_TREE_OBJECTID.
Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'volumes.c')
| -rw-r--r-- | volumes.c | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -505,8 +505,9 @@ err: return ret; } -static int find_next_chunk(struct btrfs_root *root, u64 objectid, u64 *offset) +static int find_next_chunk(struct btrfs_fs_info *fs_info, u64 *offset) { + struct btrfs_root *root = fs_info->chunk_root; struct btrfs_path *path; int ret; struct btrfs_key key; @@ -517,7 +518,7 @@ static int find_next_chunk(struct btrfs_root *root, u64 objectid, u64 *offset) if (!path) return -ENOMEM; - key.objectid = objectid; + key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID; key.offset = (u64)-1; key.type = BTRFS_CHUNK_ITEM_KEY; @@ -533,7 +534,7 @@ static int find_next_chunk(struct btrfs_root *root, u64 objectid, u64 *offset) } else { btrfs_item_key_to_cpu(path->nodes[0], &found_key, path->slots[0]); - if (found_key.objectid != objectid) + if (found_key.objectid != BTRFS_FIRST_CHUNK_TREE_OBJECTID) *offset = 0; else { chunk = btrfs_item_ptr(path->nodes[0], path->slots[0], @@ -995,8 +996,7 @@ again: } return -ENOSPC; } - ret = find_next_chunk(chunk_root, BTRFS_FIRST_CHUNK_TREE_OBJECTID, - &offset); + ret = find_next_chunk(info, &offset); if (ret) return ret; key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID; @@ -1129,9 +1129,7 @@ int btrfs_alloc_data_chunk(struct btrfs_trans_handle *trans, } else { u64 tmp; - ret = find_next_chunk(chunk_root, - BTRFS_FIRST_CHUNK_TREE_OBJECTID, - &tmp); + ret = find_next_chunk(info, &tmp); key.offset = tmp; if (ret) return ret; |