RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-24 20:17:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: Refactor btrfs_num_copies to use btrfs_fs_info

Browse Source 
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2017-06-13 17:19:18 +08:00 committed by David Sterba
parent 3e611c6983
commit a30579b1a7
8 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
btrfs-corrupt-block.c
View File

@ -88,8 +88,8 @@ static int debug_corrupt_block(struct extent_buffer *eb,
fsync(eb->fd); fsync(eb->fd);
} }
num_copies = btrfs_num_copies(&root->fs_info->mapping_tree, num_copies = btrfs_num_copies(root->fs_info, eb->start,
eb->start, eb->len); eb->len);
if (num_copies == 1) if (num_copies == 1)
break; break;

2
btrfs-map-logical.c
View File

@ -149,7 +149,7 @@ static int print_mapping_info(struct btrfs_fs_info *fs_info, u64 logical,
int mirror_num; int mirror_num;
int ret = 0; int ret = 0;
num_copies = btrfs_num_copies(&fs_info->mapping_tree, logical, len); num_copies = btrfs_num_copies(fs_info, logical, len);
for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) { for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
ret = __print_mapping_info(fs_info, logical, len, mirror_num); ret = __print_mapping_info(fs_info, logical, len, mirror_num);
if (ret < 0) if (ret < 0)

3
cmds-check.c
View File

@ -7214,8 +7214,7 @@ again:
fprintf(stderr, "mirror %d bytenr %llu csum %u expected csum %u\n", fprintf(stderr, "mirror %d bytenr %llu csum %u expected csum %u\n",
mirror, bytenr + tmp, mirror, bytenr + tmp,
csum, csum_expected); csum, csum_expected);
num_copies = btrfs_num_copies( num_copies = btrfs_num_copies(root->fs_info,
&root->fs_info->mapping_tree,
bytenr, num_bytes); bytenr, num_bytes);
if (mirror < num_copies - 1) { if (mirror < num_copies - 1) {
mirror += 1; mirror += 1;

6
cmds-restore.c
View File

@ -366,8 +366,7 @@ again:
done = pread(dev_fd, inbuf+count, length, dev_bytenr); done = pread(dev_fd, inbuf+count, length, dev_bytenr);
/* Need both checks, or we miss negative values due to u64 conversion */ /* Need both checks, or we miss negative values due to u64 conversion */
if (done < 0 || done < length) { if (done < 0 || done < length) {
num_copies = btrfs_num_copies(&root->fs_info->mapping_tree, num_copies = btrfs_num_copies(root->fs_info, bytenr, length);
bytenr, length);
mirror_num++; mirror_num++;
/* mirror_num is 1-indexed, so num_copies is a valid mirror. */ /* mirror_num is 1-indexed, so num_copies is a valid mirror. */
if (mirror_num > num_copies) { if (mirror_num > num_copies) {
@ -404,8 +403,7 @@ again:
ret = decompress(root, inbuf, outbuf, disk_size, &ram_size, compress); ret = decompress(root, inbuf, outbuf, disk_size, &ram_size, compress);
if (ret) { if (ret) {
num_copies = btrfs_num_copies(&root->fs_info->mapping_tree, num_copies = btrfs_num_copies(root->fs_info, bytenr, length);
bytenr, length);
mirror_num++; mirror_num++;
if (mirror_num >= num_copies) { if (mirror_num >= num_copies) {
ret = -1; ret = -1;

3
disk-io.c
View File

@ -370,8 +370,7 @@ struct extent_buffer* read_tree_block(
ret = -EIO; ret = -EIO;
break; break;
} }
num_copies = btrfs_num_copies(&fs_info->mapping_tree, num_copies = btrfs_num_copies(fs_info, eb->start, eb->len);
eb->start, eb->len);
if (num_copies == 1) { if (num_copies == 1) {
ignore = 1; ignore = 1;
continue; continue;

3
image/main.c
View File

@ -884,8 +884,7 @@ static int read_data_extent(struct metadump_struct *md,
int cur_mirror; int cur_mirror;
int ret; int ret;
num_copies = btrfs_num_copies(&root->fs_info->mapping_tree, logical, num_copies = btrfs_num_copies(root->fs_info, logical, bytes_left);
bytes_left);
/* Try our best to read data, just like read_tree_block() */ /* Try our best to read data, just like read_tree_block() */
for (cur_mirror = 0; cur_mirror < num_copies; cur_mirror++) { for (cur_mirror = 0; cur_mirror < num_copies; cur_mirror++) {

3
volumes.c
View File

@ -1215,8 +1215,9 @@ int btrfs_alloc_data_chunk(struct btrfs_trans_handle *trans,
return ret; return ret;
} }
int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len) int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len)
{ {
struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree;
struct cache_extent *ce; struct cache_extent *ce;
struct map_lookup *map; struct map_lookup *map;
int ret; int ret;

2
volumes.h
View File

@ -228,7 +228,7 @@ int btrfs_update_device(struct btrfs_trans_handle *trans,
int btrfs_scan_one_device(int fd, const char *path, int btrfs_scan_one_device(int fd, const char *path,
struct btrfs_fs_devices **fs_devices_ret, struct btrfs_fs_devices **fs_devices_ret,
u64 *total_devs, u64 super_offset, unsigned sbflags); u64 *total_devs, u64 super_offset, unsigned sbflags);
int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len); int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len);
struct list_head *btrfs_scanned_uuids(void); struct list_head *btrfs_scanned_uuids(void);
int btrfs_add_system_chunk(struct btrfs_root *root, struct btrfs_key *key, int btrfs_add_system_chunk(struct btrfs_root *root, struct btrfs_key *key,
struct btrfs_chunk *chunk, int item_size); struct btrfs_chunk *chunk, int item_size);