xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: get fs_info from eb in btrfs_verify_level_key

Browse Source 
We can read fs_info from extent buffer and can drop it from the
parameters.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba
2019-03-20 14:58:13 +01:00
parent 5ab12d1ff8
commit e064d5e9f0
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ctree.c
View File

@@ -2420,7 +2420,7 @@ read_block_for_search(struct btrfs_root *root, struct btrfs_path *p,
* being cached, read from scrub, or have multiple * being cached, read from scrub, or have multiple
* parents (shared tree blocks). * parents (shared tree blocks).
*/ */
if (btrfs_verify_level_key(fs_info, tmp, if (btrfs_verify_level_key(tmp,
parent_level - 1, &first_key, gen)) { parent_level - 1, &first_key, gen)) {
free_extent_buffer(tmp); free_extent_buffer(tmp);
return -EUCLEAN; return -EUCLEAN;

6
fs/btrfs/disk-io.c
View File

@@ -394,10 +394,10 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info,
return ret; return ret;
} }
int btrfs_verify_level_key(struct btrfs_fs_info *fs_info, int btrfs_verify_level_key(struct extent_buffer *eb, int level,
struct extent_buffer *eb, int level,
struct btrfs_key *first_key, u64 parent_transid) struct btrfs_key *first_key, u64 parent_transid)
{ {
struct btrfs_fs_info *fs_info = eb->fs_info;
int found_level; int found_level;
struct btrfs_key found_key; struct btrfs_key found_key;
int ret; int ret;
@@ -471,7 +471,7 @@ static int btree_read_extent_buffer_pages(struct extent_buffer *eb,
if (verify_parent_transid(io_tree, eb, if (verify_parent_transid(io_tree, eb,
parent_transid, 0)) parent_transid, 0))
ret = -EIO; ret = -EIO;
else if (btrfs_verify_level_key(fs_info, eb, level, else if (btrfs_verify_level_key(eb, level,
first_key, parent_transid)) first_key, parent_transid))
ret = -EUCLEAN; ret = -EUCLEAN;
else else

3
fs/btrfs/disk-io.h
View File

@@ -39,8 +39,7 @@ static inline u64 btrfs_sb_offset(int mirror)
struct btrfs_device; struct btrfs_device;
struct btrfs_fs_devices; struct btrfs_fs_devices;
int btrfs_verify_level_key(struct btrfs_fs_info *fs_info, int btrfs_verify_level_key(struct extent_buffer *eb, int level,
struct extent_buffer *eb, int level,
struct btrfs_key *first_key, u64 parent_transid); struct btrfs_key *first_key, u64 parent_transid);
struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr, struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
u64 parent_transid, int level, u64 parent_transid, int level,