marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: drop redundant check of blocksize in read_tree_block 

The tree blocks are supposed to be always of nodesize. Before the
parameter has been dropped, it was unlikely but possible to pass a
misaligned value.

Signed-off-by: David Sterba <dsterba@suse.com>
master
David Sterba 2017-08-25 17:30:34 +02:00
parent 819a496ded
commit d1b968dcba
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
disk-io.c
View File

@ -307,7 +307,6 @@ struct extent_buffer* read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
u64 best_transid = 0;
u32 sectorsize = fs_info->sectorsize;
u32 nodesize = fs_info->nodesize;
u32 blocksize = fs_info->nodesize;
int mirror_num = 0;
int good_mirror = 0;
int num_copies;
@ -324,13 +323,8 @@ struct extent_buffer* read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
bytenr, sectorsize);
return ERR_PTR(-EIO);
}
if (blocksize < nodesize || !IS_ALIGNED(blocksize, nodesize)) {
error("tree block size %u is not aligned to nodesize %u",
blocksize, nodesize);
return ERR_PTR(-EIO);
}
eb = btrfs_find_create_tree_block(fs_info, bytenr, blocksize);
eb = btrfs_find_create_tree_block(fs_info, bytenr, nodesize);
if (!eb)
return ERR_PTR(-ENOMEM);