projects
/
platform
/
upstream
/
btrfs-progs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs-progs: configure: check if xmlto exists at configure time
[platform/upstream/btrfs-progs.git]
/
btrfs-map-logical.c
diff --git
a/btrfs-map-logical.c
b/btrfs-map-logical.c
index
e88357f
..
7a8bcff
100644
(file)
--- a/
btrfs-map-logical.c
+++ b/
btrfs-map-logical.c
@@
-109,9
+109,8
@@
static int __print_mapping_info(struct btrfs_fs_info *fs_info, u64 logical,
int i;
cur_len = len - cur_offset;
int i;
cur_len = len - cur_offset;
- ret = btrfs_map_block(&fs_info->mapping_tree, READ,
- logical + cur_offset, &cur_len,
- &multi, mirror_num, NULL);
+ ret = btrfs_map_block(fs_info, READ, logical + cur_offset,
+ &cur_len, &multi, mirror_num, NULL);
if (ret) {
fprintf(info_file,
"Error: fails to map mirror%d logical %llu: %s\n",
if (ret) {
fprintf(info_file,
"Error: fails to map mirror%d logical %llu: %s\n",
@@
-150,7
+149,7
@@
static int print_mapping_info(struct btrfs_fs_info *fs_info, u64 logical,
int mirror_num;
int ret = 0;
int mirror_num;
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++) {
ret = __print_mapping_info(fs_info, logical, len, mirror_num);
if (ret < 0)
for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
ret = __print_mapping_info(fs_info, logical, len, mirror_num);
if (ret < 0)
@@
-170,7
+169,7
@@
static int write_extent_content(struct btrfs_fs_info *fs_info, int out_fd,
while (cur_offset < length) {
cur_len = min_t(u64, length - cur_offset, BUFFER_SIZE);
while (cur_offset < length) {
cur_len = min_t(u64, length - cur_offset, BUFFER_SIZE);
- ret = read_extent_data(fs_info
->tree_root
, buffer,
+ ret = read_extent_data(fs_info, buffer,
logical + cur_offset, &cur_len, mirror);
if (ret < 0) {
fprintf(stderr,
logical + cur_offset, &cur_len, mirror);
if (ret < 0) {
fprintf(stderr,
@@
-191,7
+190,7
@@
static int write_extent_content(struct btrfs_fs_info *fs_info, int out_fd,
return ret;
}
return ret;
}
-static void print_usage(void) __attribute__((noreturn));
+__attribute__((noreturn))
static void print_usage(void)
{
printf("usage: btrfs-map-logical [options] device\n");
static void print_usage(void)
{
printf("usage: btrfs-map-logical [options] device\n");