RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-27 21:47:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: convert: use on-stack path buffer in record_file_blocks

Browse Source 
We don't need to conserve stack space too much unlike kernel, also
remove one error condition.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-11-03 00:37:51 +01:00
parent a34b3b9273
commit aca69c9d39
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
btrfs-convert.c
View File

@ -283,7 +283,7 @@ static int record_file_blocks(struct blk_iterate_data *data,
int ret = 0; int ret = 0;
struct btrfs_root *root = data->root; struct btrfs_root *root = data->root;
struct btrfs_root *convert_root = data->convert_root; struct btrfs_root *convert_root = data->convert_root;
struct btrfs_path *path; struct btrfs_path path;
u64 file_pos = file_block * root->sectorsize; u64 file_pos = file_block * root->sectorsize;
u64 old_disk_bytenr = disk_block * root->sectorsize; u64 old_disk_bytenr = disk_block * root->sectorsize;
u64 num_bytes = num_blocks * root->sectorsize; u64 num_bytes = num_blocks * root->sectorsize;
@ -295,9 +295,7 @@ static int record_file_blocks(struct blk_iterate_data *data,
data->objectid, data->inode, file_pos, 0, data->objectid, data->inode, file_pos, 0,
num_bytes); num_bytes);
path = btrfs_alloc_path(); btrfs_init_path(&path);
if (!path)
return -ENOMEM;
/* /*
* Search real disk bytenr from convert root * Search real disk bytenr from convert root
@ -316,11 +314,11 @@ static int record_file_blocks(struct blk_iterate_data *data,
key.type = BTRFS_EXTENT_DATA_KEY; key.type = BTRFS_EXTENT_DATA_KEY;
key.offset = cur_off; key.offset = cur_off;
ret = btrfs_search_slot(NULL, convert_root, &key, path, 0, 0); ret = btrfs_search_slot(NULL, convert_root, &key, &path, 0, 0);
if (ret < 0) if (ret < 0)
break; break;
if (ret > 0) { if (ret > 0) {
ret = btrfs_previous_item(convert_root, path, ret = btrfs_previous_item(convert_root, &path,
data->convert_ino, data->convert_ino,
BTRFS_EXTENT_DATA_KEY); BTRFS_EXTENT_DATA_KEY);
if (ret < 0) if (ret < 0)
@ -330,8 +328,8 @@ static int record_file_blocks(struct blk_iterate_data *data,
break; break;
} }
} }
node = path->nodes[0]; node = path.nodes[0];
slot = path->slots[0]; slot = path.slots[0];
btrfs_item_key_to_cpu(node, &key, slot); btrfs_item_key_to_cpu(node, &key, slot);
BUG_ON(key.type != BTRFS_EXTENT_DATA_KEY || BUG_ON(key.type != BTRFS_EXTENT_DATA_KEY ||
key.objectid != data->convert_ino || key.objectid != data->convert_ino ||
@ -340,7 +338,7 @@ static int record_file_blocks(struct blk_iterate_data *data,
extent_disk_bytenr = btrfs_file_extent_disk_bytenr(node, fi); extent_disk_bytenr = btrfs_file_extent_disk_bytenr(node, fi);
extent_num_bytes = btrfs_file_extent_disk_num_bytes(node, fi); extent_num_bytes = btrfs_file_extent_disk_num_bytes(node, fi);
BUG_ON(cur_off - key.offset >= extent_num_bytes); BUG_ON(cur_off - key.offset >= extent_num_bytes);
btrfs_release_path(path); btrfs_release_path(&path);
if (extent_disk_bytenr) if (extent_disk_bytenr)
real_disk_bytenr = cur_off - key.offset + real_disk_bytenr = cur_off - key.offset +
@ -363,7 +361,7 @@ static int record_file_blocks(struct blk_iterate_data *data,
* need to waste CPU cycles now. * need to waste CPU cycles now.
*/ */
} }
btrfs_free_path(path); btrfs_release_path(&path);
return ret; return ret;
} }