Skip to content

Commit a26657d

Browse files
committed
btrfs-progs: convert: merge setup_temp_fs_tree() and setup_temp_csum_tree()
Both fs and csum trees are empty at make_convert_btrfs(), no need to use two different functions to do that. Merge them into a common setup_temp_empty_tree() instead. Signed-off-by: Qu Wenruo <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent fb030a7 commit a26657d

File tree

1 file changed

+6
-29
lines changed

1 file changed

+6
-29
lines changed

convert/common.c

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -514,45 +514,22 @@ static int setup_temp_dev_tree(int fd, struct btrfs_mkfs_config *cfg,
514514
return ret;
515515
}
516516

517-
static int setup_temp_fs_tree(int fd, struct btrfs_mkfs_config *cfg,
518-
u64 fs_bytenr)
517+
static int setup_temp_empty_tree(int fd, struct btrfs_mkfs_config *cfg,
518+
u64 root_bytenr, u64 owner)
519519
{
520520
struct extent_buffer *buf = NULL;
521521
int ret;
522522

523523
buf = malloc(sizeof(*buf) + cfg->nodesize);
524524
if (!buf)
525525
return -ENOMEM;
526-
ret = setup_temp_extent_buffer(buf, cfg, fs_bytenr,
527-
BTRFS_FS_TREE_OBJECTID);
526+
ret = setup_temp_extent_buffer(buf, cfg, root_bytenr, owner);
528527
if (ret < 0)
529528
goto out;
530529
/*
531530
* Temporary fs tree is completely empty.
532531
*/
533-
ret = write_temp_extent_buffer(fd, buf, fs_bytenr, cfg);
534-
out:
535-
free(buf);
536-
return ret;
537-
}
538-
539-
static int setup_temp_csum_tree(int fd, struct btrfs_mkfs_config *cfg,
540-
u64 csum_bytenr)
541-
{
542-
struct extent_buffer *buf = NULL;
543-
int ret;
544-
545-
buf = malloc(sizeof(*buf) + cfg->nodesize);
546-
if (!buf)
547-
return -ENOMEM;
548-
ret = setup_temp_extent_buffer(buf, cfg, csum_bytenr,
549-
BTRFS_CSUM_TREE_OBJECTID);
550-
if (ret < 0)
551-
goto out;
552-
/*
553-
* Temporary csum tree is completely empty.
554-
*/
555-
ret = write_temp_extent_buffer(fd, buf, csum_bytenr, cfg);
532+
ret = write_temp_extent_buffer(fd, buf, root_bytenr, cfg);
556533
out:
557534
free(buf);
558535
return ret;
@@ -867,10 +844,10 @@ int make_convert_btrfs(int fd, struct btrfs_mkfs_config *cfg,
867844
dev_bytenr);
868845
if (ret < 0)
869846
goto out;
870-
ret = setup_temp_fs_tree(fd, cfg, fs_bytenr);
847+
ret = setup_temp_empty_tree(fd, cfg, fs_bytenr, BTRFS_FS_TREE_OBJECTID);
871848
if (ret < 0)
872849
goto out;
873-
ret = setup_temp_csum_tree(fd, cfg, csum_bytenr);
850+
ret = setup_temp_empty_tree(fd, cfg, csum_bytenr, BTRFS_CSUM_TREE_OBJECTID);
874851
if (ret < 0)
875852
goto out;
876853
/*

0 commit comments

Comments
 (0)