diff options
author | Ross Kirk <ross.kirk@gmail.com> | 2013-09-16 10:58:09 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-11-11 21:50:48 -0500 |
commit | dd3cc16b8750251ea9b1a843ce7806e82b015d5e (patch) | |
tree | 9cb6e2d093ff52dffaa09b7474e805152691a541 /fs/btrfs/ctree.c | |
parent | f06becc4119856c984e3beef54aa75538e656c6d (diff) |
btrfs: drop unused parameter from btrfs_item_nr
Remove unused eb parameter from btrfs_item_nr
Signed-off-by: Ross Kirk <ross.kirk@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/ctree.c')
-rw-r--r-- | fs/btrfs/ctree.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 61b5bcd57b7e..c274a752c93d 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c | |||
@@ -3337,8 +3337,8 @@ static int leaf_space_used(struct extent_buffer *l, int start, int nr) | |||
3337 | if (!nr) | 3337 | if (!nr) |
3338 | return 0; | 3338 | return 0; |
3339 | btrfs_init_map_token(&token); | 3339 | btrfs_init_map_token(&token); |
3340 | start_item = btrfs_item_nr(l, start); | 3340 | start_item = btrfs_item_nr(start); |
3341 | end_item = btrfs_item_nr(l, end); | 3341 | end_item = btrfs_item_nr(end); |
3342 | data_len = btrfs_token_item_offset(l, start_item, &token) + | 3342 | data_len = btrfs_token_item_offset(l, start_item, &token) + |
3343 | btrfs_token_item_size(l, start_item, &token); | 3343 | btrfs_token_item_size(l, start_item, &token); |
3344 | data_len = data_len - btrfs_token_item_offset(l, end_item, &token); | 3344 | data_len = data_len - btrfs_token_item_offset(l, end_item, &token); |
@@ -3406,7 +3406,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans, | |||
3406 | slot = path->slots[1]; | 3406 | slot = path->slots[1]; |
3407 | i = left_nritems - 1; | 3407 | i = left_nritems - 1; |
3408 | while (i >= nr) { | 3408 | while (i >= nr) { |
3409 | item = btrfs_item_nr(left, i); | 3409 | item = btrfs_item_nr(i); |
3410 | 3410 | ||
3411 | if (!empty && push_items > 0) { | 3411 | if (!empty && push_items > 0) { |
3412 | if (path->slots[0] > i) | 3412 | if (path->slots[0] > i) |
@@ -3470,7 +3470,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans, | |||
3470 | btrfs_set_header_nritems(right, right_nritems); | 3470 | btrfs_set_header_nritems(right, right_nritems); |
3471 | push_space = BTRFS_LEAF_DATA_SIZE(root); | 3471 | push_space = BTRFS_LEAF_DATA_SIZE(root); |
3472 | for (i = 0; i < right_nritems; i++) { | 3472 | for (i = 0; i < right_nritems; i++) { |
3473 | item = btrfs_item_nr(right, i); | 3473 | item = btrfs_item_nr(i); |
3474 | push_space -= btrfs_token_item_size(right, item, &token); | 3474 | push_space -= btrfs_token_item_size(right, item, &token); |
3475 | btrfs_set_token_item_offset(right, item, push_space, &token); | 3475 | btrfs_set_token_item_offset(right, item, push_space, &token); |
3476 | } | 3476 | } |
@@ -3612,7 +3612,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans, | |||
3612 | nr = min(right_nritems - 1, max_slot); | 3612 | nr = min(right_nritems - 1, max_slot); |
3613 | 3613 | ||
3614 | for (i = 0; i < nr; i++) { | 3614 | for (i = 0; i < nr; i++) { |
3615 | item = btrfs_item_nr(right, i); | 3615 | item = btrfs_item_nr(i); |
3616 | 3616 | ||
3617 | if (!empty && push_items > 0) { | 3617 | if (!empty && push_items > 0) { |
3618 | if (path->slots[0] < i) | 3618 | if (path->slots[0] < i) |
@@ -3663,7 +3663,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans, | |||
3663 | for (i = old_left_nritems; i < old_left_nritems + push_items; i++) { | 3663 | for (i = old_left_nritems; i < old_left_nritems + push_items; i++) { |
3664 | u32 ioff; | 3664 | u32 ioff; |
3665 | 3665 | ||
3666 | item = btrfs_item_nr(left, i); | 3666 | item = btrfs_item_nr(i); |
3667 | 3667 | ||
3668 | ioff = btrfs_token_item_offset(left, item, &token); | 3668 | ioff = btrfs_token_item_offset(left, item, &token); |
3669 | btrfs_set_token_item_offset(left, item, | 3669 | btrfs_set_token_item_offset(left, item, |
@@ -3694,7 +3694,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans, | |||
3694 | btrfs_set_header_nritems(right, right_nritems); | 3694 | btrfs_set_header_nritems(right, right_nritems); |
3695 | push_space = BTRFS_LEAF_DATA_SIZE(root); | 3695 | push_space = BTRFS_LEAF_DATA_SIZE(root); |
3696 | for (i = 0; i < right_nritems; i++) { | 3696 | for (i = 0; i < right_nritems; i++) { |
3697 | item = btrfs_item_nr(right, i); | 3697 | item = btrfs_item_nr(i); |
3698 | 3698 | ||
3699 | push_space = push_space - btrfs_token_item_size(right, | 3699 | push_space = push_space - btrfs_token_item_size(right, |
3700 | item, &token); | 3700 | item, &token); |
@@ -3835,7 +3835,7 @@ static noinline void copy_for_split(struct btrfs_trans_handle *trans, | |||
3835 | btrfs_item_end_nr(l, mid); | 3835 | btrfs_item_end_nr(l, mid); |
3836 | 3836 | ||
3837 | for (i = 0; i < nritems; i++) { | 3837 | for (i = 0; i < nritems; i++) { |
3838 | struct btrfs_item *item = btrfs_item_nr(right, i); | 3838 | struct btrfs_item *item = btrfs_item_nr(i); |
3839 | u32 ioff; | 3839 | u32 ioff; |
3840 | 3840 | ||
3841 | ioff = btrfs_token_item_offset(right, item, &token); | 3841 | ioff = btrfs_token_item_offset(right, item, &token); |
@@ -4177,7 +4177,7 @@ static noinline int split_item(struct btrfs_trans_handle *trans, | |||
4177 | 4177 | ||
4178 | btrfs_set_path_blocking(path); | 4178 | btrfs_set_path_blocking(path); |
4179 | 4179 | ||
4180 | item = btrfs_item_nr(leaf, path->slots[0]); | 4180 | item = btrfs_item_nr(path->slots[0]); |
4181 | orig_offset = btrfs_item_offset(leaf, item); | 4181 | orig_offset = btrfs_item_offset(leaf, item); |
4182 | item_size = btrfs_item_size(leaf, item); | 4182 | item_size = btrfs_item_size(leaf, item); |
4183 | 4183 | ||
@@ -4200,7 +4200,7 @@ static noinline int split_item(struct btrfs_trans_handle *trans, | |||
4200 | btrfs_cpu_key_to_disk(&disk_key, new_key); | 4200 | btrfs_cpu_key_to_disk(&disk_key, new_key); |
4201 | btrfs_set_item_key(leaf, &disk_key, slot); | 4201 | btrfs_set_item_key(leaf, &disk_key, slot); |
4202 | 4202 | ||
4203 | new_item = btrfs_item_nr(leaf, slot); | 4203 | new_item = btrfs_item_nr(slot); |
4204 | 4204 | ||
4205 | btrfs_set_item_offset(leaf, new_item, orig_offset); | 4205 | btrfs_set_item_offset(leaf, new_item, orig_offset); |
4206 | btrfs_set_item_size(leaf, new_item, item_size - split_offset); | 4206 | btrfs_set_item_size(leaf, new_item, item_size - split_offset); |
@@ -4339,7 +4339,7 @@ void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path, | |||
4339 | /* first correct the data pointers */ | 4339 | /* first correct the data pointers */ |
4340 | for (i = slot; i < nritems; i++) { | 4340 | for (i = slot; i < nritems; i++) { |
4341 | u32 ioff; | 4341 | u32 ioff; |
4342 | item = btrfs_item_nr(leaf, i); | 4342 | item = btrfs_item_nr(i); |
4343 | 4343 | ||
4344 | ioff = btrfs_token_item_offset(leaf, item, &token); | 4344 | ioff = btrfs_token_item_offset(leaf, item, &token); |
4345 | btrfs_set_token_item_offset(leaf, item, | 4345 | btrfs_set_token_item_offset(leaf, item, |
@@ -4387,7 +4387,7 @@ void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path, | |||
4387 | fixup_low_keys(root, path, &disk_key, 1); | 4387 | fixup_low_keys(root, path, &disk_key, 1); |
4388 | } | 4388 | } |
4389 | 4389 | ||
4390 | item = btrfs_item_nr(leaf, slot); | 4390 | item = btrfs_item_nr(slot); |
4391 | btrfs_set_item_size(leaf, item, new_size); | 4391 | btrfs_set_item_size(leaf, item, new_size); |
4392 | btrfs_mark_buffer_dirty(leaf); | 4392 | btrfs_mark_buffer_dirty(leaf); |
4393 | 4393 | ||
@@ -4441,7 +4441,7 @@ void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path, | |||
4441 | /* first correct the data pointers */ | 4441 | /* first correct the data pointers */ |
4442 | for (i = slot; i < nritems; i++) { | 4442 | for (i = slot; i < nritems; i++) { |
4443 | u32 ioff; | 4443 | u32 ioff; |
4444 | item = btrfs_item_nr(leaf, i); | 4444 | item = btrfs_item_nr(i); |
4445 | 4445 | ||
4446 | ioff = btrfs_token_item_offset(leaf, item, &token); | 4446 | ioff = btrfs_token_item_offset(leaf, item, &token); |
4447 | btrfs_set_token_item_offset(leaf, item, | 4447 | btrfs_set_token_item_offset(leaf, item, |
@@ -4455,7 +4455,7 @@ void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path, | |||
4455 | 4455 | ||
4456 | data_end = old_data; | 4456 | data_end = old_data; |
4457 | old_size = btrfs_item_size_nr(leaf, slot); | 4457 | old_size = btrfs_item_size_nr(leaf, slot); |
4458 | item = btrfs_item_nr(leaf, slot); | 4458 | item = btrfs_item_nr(slot); |
4459 | btrfs_set_item_size(leaf, item, old_size + data_size); | 4459 | btrfs_set_item_size(leaf, item, old_size + data_size); |
4460 | btrfs_mark_buffer_dirty(leaf); | 4460 | btrfs_mark_buffer_dirty(leaf); |
4461 | 4461 | ||
@@ -4514,7 +4514,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, | |||
4514 | for (i = slot; i < nritems; i++) { | 4514 | for (i = slot; i < nritems; i++) { |
4515 | u32 ioff; | 4515 | u32 ioff; |
4516 | 4516 | ||
4517 | item = btrfs_item_nr(leaf, i); | 4517 | item = btrfs_item_nr( i); |
4518 | ioff = btrfs_token_item_offset(leaf, item, &token); | 4518 | ioff = btrfs_token_item_offset(leaf, item, &token); |
4519 | btrfs_set_token_item_offset(leaf, item, | 4519 | btrfs_set_token_item_offset(leaf, item, |
4520 | ioff - total_data, &token); | 4520 | ioff - total_data, &token); |
@@ -4535,7 +4535,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, | |||
4535 | for (i = 0; i < nr; i++) { | 4535 | for (i = 0; i < nr; i++) { |
4536 | btrfs_cpu_key_to_disk(&disk_key, cpu_key + i); | 4536 | btrfs_cpu_key_to_disk(&disk_key, cpu_key + i); |
4537 | btrfs_set_item_key(leaf, &disk_key, slot + i); | 4537 | btrfs_set_item_key(leaf, &disk_key, slot + i); |
4538 | item = btrfs_item_nr(leaf, slot + i); | 4538 | item = btrfs_item_nr(slot + i); |
4539 | btrfs_set_token_item_offset(leaf, item, | 4539 | btrfs_set_token_item_offset(leaf, item, |
4540 | data_end - data_size[i], &token); | 4540 | data_end - data_size[i], &token); |
4541 | data_end -= data_size[i]; | 4541 | data_end -= data_size[i]; |
@@ -4730,7 +4730,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, | |||
4730 | for (i = slot + nr; i < nritems; i++) { | 4730 | for (i = slot + nr; i < nritems; i++) { |
4731 | u32 ioff; | 4731 | u32 ioff; |
4732 | 4732 | ||
4733 | item = btrfs_item_nr(leaf, i); | 4733 | item = btrfs_item_nr(i); |
4734 | ioff = btrfs_token_item_offset(leaf, item, &token); | 4734 | ioff = btrfs_token_item_offset(leaf, item, &token); |
4735 | btrfs_set_token_item_offset(leaf, item, | 4735 | btrfs_set_token_item_offset(leaf, item, |
4736 | ioff + dsize, &token); | 4736 | ioff + dsize, &token); |