diff options
author | David Sterba <dsterba@suse.cz> | 2014-06-14 21:34:59 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-12-12 12:07:22 -0500 |
commit | 7476dfdaade5b373db4679555706546bd5b4bd6c (patch) | |
tree | 91c671d86299a974b863639160affd471e624c5e /fs | |
parent | a83fffb75d09cd3d44167b7fb9c1ab9e2269445f (diff) |
btrfs: sink blocksize parameter to tree_block_processed
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/relocation.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index cb5d4462ebb4..d83085381bcc 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
@@ -2855,9 +2855,10 @@ static void update_processed_blocks(struct reloc_control *rc, | |||
2855 | } | 2855 | } |
2856 | } | 2856 | } |
2857 | 2857 | ||
2858 | static int tree_block_processed(u64 bytenr, u32 blocksize, | 2858 | static int tree_block_processed(u64 bytenr, struct reloc_control *rc) |
2859 | struct reloc_control *rc) | ||
2860 | { | 2859 | { |
2860 | u32 blocksize = rc->extent_root->nodesize; | ||
2861 | |||
2861 | if (test_range_bit(&rc->processed_blocks, bytenr, | 2862 | if (test_range_bit(&rc->processed_blocks, bytenr, |
2862 | bytenr + blocksize - 1, EXTENT_DIRTY, 1, NULL)) | 2863 | bytenr + blocksize - 1, EXTENT_DIRTY, 1, NULL)) |
2863 | return 1; | 2864 | return 1; |
@@ -3352,7 +3353,7 @@ static int __add_tree_block(struct reloc_control *rc, | |||
3352 | bool skinny = btrfs_fs_incompat(rc->extent_root->fs_info, | 3353 | bool skinny = btrfs_fs_incompat(rc->extent_root->fs_info, |
3353 | SKINNY_METADATA); | 3354 | SKINNY_METADATA); |
3354 | 3355 | ||
3355 | if (tree_block_processed(bytenr, blocksize, rc)) | 3356 | if (tree_block_processed(bytenr, rc)) |
3356 | return 0; | 3357 | return 0; |
3357 | 3358 | ||
3358 | if (tree_search(blocks, bytenr)) | 3359 | if (tree_search(blocks, bytenr)) |
@@ -3610,7 +3611,7 @@ static int find_data_references(struct reloc_control *rc, | |||
3610 | if (added) | 3611 | if (added) |
3611 | goto next; | 3612 | goto next; |
3612 | 3613 | ||
3613 | if (!tree_block_processed(leaf->start, leaf->len, rc)) { | 3614 | if (!tree_block_processed(leaf->start, rc)) { |
3614 | block = kmalloc(sizeof(*block), GFP_NOFS); | 3615 | block = kmalloc(sizeof(*block), GFP_NOFS); |
3615 | if (!block) { | 3616 | if (!block) { |
3616 | err = -ENOMEM; | 3617 | err = -ENOMEM; |