Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dd3cc16b8750251ea9b1a843ce7806e82b015d5e

Authored by Ross Kirk
Committed by Chris Mason
1 parent f06becc411
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 8 changed files with 31 additions and 32 deletions Side-by-side Diff

... ... @@ -1619,7 +1619,7 @@
1619 1619 btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
1620 1620 btrfs_release_path(path);
1621 1621  
1622   - item = btrfs_item_nr(eb, slot);
  1622 + item = btrfs_item_nr(slot);
1623 1623 iref = btrfs_item_ptr(eb, slot, struct btrfs_inode_ref);
1624 1624  
1625 1625 for (cur = 0; cur < btrfs_item_size(eb, item); cur += len) {
... ... @@ -3337,8 +3337,8 @@
3337 3337 if (!nr)
3338 3338 return 0;
3339 3339 btrfs_init_map_token(&token);
3340   - start_item = btrfs_item_nr(l, start);
3341   - end_item = btrfs_item_nr(l, end);
  3340 + start_item = btrfs_item_nr(start);
  3341 + end_item = btrfs_item_nr(end);
3342 3342 data_len = btrfs_token_item_offset(l, start_item, &token) +
3343 3343 btrfs_token_item_size(l, start_item, &token);
3344 3344 data_len = data_len - btrfs_token_item_offset(l, end_item, &token);
... ... @@ -3406,7 +3406,7 @@
3406 3406 slot = path->slots[1];
3407 3407 i = left_nritems - 1;
3408 3408 while (i >= nr) {
3409   - item = btrfs_item_nr(left, i);
  3409 + item = btrfs_item_nr(i);
3410 3410  
3411 3411 if (!empty && push_items > 0) {
3412 3412 if (path->slots[0] > i)
... ... @@ -3470,7 +3470,7 @@
3470 3470 btrfs_set_header_nritems(right, right_nritems);
3471 3471 push_space = BTRFS_LEAF_DATA_SIZE(root);
3472 3472 for (i = 0; i < right_nritems; i++) {
3473   - item = btrfs_item_nr(right, i);
  3473 + item = btrfs_item_nr(i);
3474 3474 push_space -= btrfs_token_item_size(right, item, &token);
3475 3475 btrfs_set_token_item_offset(right, item, push_space, &token);
3476 3476 }
... ... @@ -3612,7 +3612,7 @@
3612 3612 nr = min(right_nritems - 1, max_slot);
3613 3613  
3614 3614 for (i = 0; i < nr; i++) {
3615   - item = btrfs_item_nr(right, i);
  3615 + item = btrfs_item_nr(i);
3616 3616  
3617 3617 if (!empty && push_items > 0) {
3618 3618 if (path->slots[0] < i)
... ... @@ -3663,7 +3663,7 @@
3663 3663 for (i = old_left_nritems; i < old_left_nritems + push_items; i++) {
3664 3664 u32 ioff;
3665 3665  
3666   - item = btrfs_item_nr(left, i);
  3666 + item = btrfs_item_nr(i);
3667 3667  
3668 3668 ioff = btrfs_token_item_offset(left, item, &token);
3669 3669 btrfs_set_token_item_offset(left, item,
... ... @@ -3694,7 +3694,7 @@
3694 3694 btrfs_set_header_nritems(right, right_nritems);
3695 3695 push_space = BTRFS_LEAF_DATA_SIZE(root);
3696 3696 for (i = 0; i < right_nritems; i++) {
3697   - item = btrfs_item_nr(right, i);
  3697 + item = btrfs_item_nr(i);
3698 3698  
3699 3699 push_space = push_space - btrfs_token_item_size(right,
3700 3700 item, &token);
... ... @@ -3835,7 +3835,7 @@
3835 3835 btrfs_item_end_nr(l, mid);
3836 3836  
3837 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 3839 u32 ioff;
3840 3840  
3841 3841 ioff = btrfs_token_item_offset(right, item, &token);
... ... @@ -4177,7 +4177,7 @@
4177 4177  
4178 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 4181 orig_offset = btrfs_item_offset(leaf, item);
4182 4182 item_size = btrfs_item_size(leaf, item);
4183 4183  
... ... @@ -4200,7 +4200,7 @@
4200 4200 btrfs_cpu_key_to_disk(&disk_key, new_key);
4201 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 4205 btrfs_set_item_offset(leaf, new_item, orig_offset);
4206 4206 btrfs_set_item_size(leaf, new_item, item_size - split_offset);
... ... @@ -4339,7 +4339,7 @@
4339 4339 /* first correct the data pointers */
4340 4340 for (i = slot; i < nritems; i++) {
4341 4341 u32 ioff;
4342   - item = btrfs_item_nr(leaf, i);
  4342 + item = btrfs_item_nr(i);
4343 4343  
4344 4344 ioff = btrfs_token_item_offset(leaf, item, &token);
4345 4345 btrfs_set_token_item_offset(leaf, item,
... ... @@ -4387,7 +4387,7 @@
4387 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 4391 btrfs_set_item_size(leaf, item, new_size);
4392 4392 btrfs_mark_buffer_dirty(leaf);
4393 4393  
... ... @@ -4441,7 +4441,7 @@
4441 4441 /* first correct the data pointers */
4442 4442 for (i = slot; i < nritems; i++) {
4443 4443 u32 ioff;
4444   - item = btrfs_item_nr(leaf, i);
  4444 + item = btrfs_item_nr(i);
4445 4445  
4446 4446 ioff = btrfs_token_item_offset(leaf, item, &token);
4447 4447 btrfs_set_token_item_offset(leaf, item,
... ... @@ -4455,7 +4455,7 @@
4455 4455  
4456 4456 data_end = old_data;
4457 4457 old_size = btrfs_item_size_nr(leaf, slot);
4458   - item = btrfs_item_nr(leaf, slot);
  4458 + item = btrfs_item_nr(slot);
4459 4459 btrfs_set_item_size(leaf, item, old_size + data_size);
4460 4460 btrfs_mark_buffer_dirty(leaf);
4461 4461  
... ... @@ -4514,7 +4514,7 @@
4514 4514 for (i = slot; i < nritems; i++) {
4515 4515 u32 ioff;
4516 4516  
4517   - item = btrfs_item_nr(leaf, i);
  4517 + item = btrfs_item_nr( i);
4518 4518 ioff = btrfs_token_item_offset(leaf, item, &token);
4519 4519 btrfs_set_token_item_offset(leaf, item,
4520 4520 ioff - total_data, &token);
... ... @@ -4535,7 +4535,7 @@
4535 4535 for (i = 0; i < nr; i++) {
4536 4536 btrfs_cpu_key_to_disk(&disk_key, cpu_key + i);
4537 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 4539 btrfs_set_token_item_offset(leaf, item,
4540 4540 data_end - data_size[i], &token);
4541 4541 data_end -= data_size[i];
... ... @@ -4730,7 +4730,7 @@
4730 4730 for (i = slot + nr; i < nritems; i++) {
4731 4731 u32 ioff;
4732 4732  
4733   - item = btrfs_item_nr(leaf, i);
  4733 + item = btrfs_item_nr(i);
4734 4734 ioff = btrfs_token_item_offset(leaf, item, &token);
4735 4735 btrfs_set_token_item_offset(leaf, item,
4736 4736 ioff + dsize, &token);
... ... @@ -2461,8 +2461,7 @@
2461 2461 sizeof(struct btrfs_item) * nr;
2462 2462 }
2463 2463  
2464   -static inline struct btrfs_item *btrfs_item_nr(struct extent_buffer *eb,
2465   - int nr)
  2464 +static inline struct btrfs_item *btrfs_item_nr(int nr)
2466 2465 {
2467 2466 return (struct btrfs_item *)btrfs_item_nr_offset(nr);
2468 2467 }
2469 2468  
2470 2469  
2471 2470  
2472 2471  
... ... @@ -2475,30 +2474,30 @@
2475 2474  
2476 2475 static inline u32 btrfs_item_end_nr(struct extent_buffer *eb, int nr)
2477 2476 {
2478   - return btrfs_item_end(eb, btrfs_item_nr(eb, nr));
  2477 + return btrfs_item_end(eb, btrfs_item_nr(nr));
2479 2478 }
2480 2479  
2481 2480 static inline u32 btrfs_item_offset_nr(struct extent_buffer *eb, int nr)
2482 2481 {
2483   - return btrfs_item_offset(eb, btrfs_item_nr(eb, nr));
  2482 + return btrfs_item_offset(eb, btrfs_item_nr(nr));
2484 2483 }
2485 2484  
2486 2485 static inline u32 btrfs_item_size_nr(struct extent_buffer *eb, int nr)
2487 2486 {
2488   - return btrfs_item_size(eb, btrfs_item_nr(eb, nr));
  2487 + return btrfs_item_size(eb, btrfs_item_nr(nr));
2489 2488 }
2490 2489  
2491 2490 static inline void btrfs_item_key(struct extent_buffer *eb,
2492 2491 struct btrfs_disk_key *disk_key, int nr)
2493 2492 {
2494   - struct btrfs_item *item = btrfs_item_nr(eb, nr);
  2493 + struct btrfs_item *item = btrfs_item_nr(nr);
2495 2494 read_eb_member(eb, item, struct btrfs_item, key, disk_key);
2496 2495 }
2497 2496  
2498 2497 static inline void btrfs_set_item_key(struct extent_buffer *eb,
2499 2498 struct btrfs_disk_key *disk_key, int nr)
2500 2499 {
2501   - struct btrfs_item *item = btrfs_item_nr(eb, nr);
  2500 + struct btrfs_item *item = btrfs_item_nr(nr);
2502 2501 write_eb_member(eb, item, struct btrfs_item, key, disk_key);
2503 2502 }
2504 2503  
... ... @@ -58,7 +58,7 @@
58 58 return ERR_PTR(ret);
59 59 WARN_ON(ret > 0);
60 60 leaf = path->nodes[0];
61   - item = btrfs_item_nr(leaf, path->slots[0]);
  61 + item = btrfs_item_nr(path->slots[0]);
62 62 ptr = btrfs_item_ptr(leaf, path->slots[0], char);
63 63 BUG_ON(data_size > btrfs_item_size(leaf, item));
64 64 ptr += btrfs_item_size(leaf, item) - data_size;
fs/btrfs/inode-item.c
Diff comments   View file @ dd3cc16
... ... @@ -369,7 +369,7 @@
369 369 goto out;
370 370  
371 371 leaf = path->nodes[0];
372   - item = btrfs_item_nr(leaf, path->slots[0]);
  372 + item = btrfs_item_nr(path->slots[0]);
373 373 ptr = (unsigned long)btrfs_item_ptr(leaf, path->slots[0], char);
374 374 ptr += btrfs_item_size(leaf, item) - ins_len;
375 375 extref = (struct btrfs_inode_extref *)ptr;
... ... @@ -5044,7 +5044,7 @@
5044 5044 continue;
5045 5045 }
5046 5046  
5047   - item = btrfs_item_nr(leaf, slot);
  5047 + item = btrfs_item_nr(slot);
5048 5048 btrfs_item_key_to_cpu(leaf, &found_key, slot);
5049 5049  
5050 5050 if (found_key.objectid != key.objectid)
... ... @@ -5856,7 +5856,7 @@
5856 5856 compress_type = btrfs_file_extent_compression(leaf, item);
5857 5857 max_size = btrfs_file_extent_ram_bytes(leaf, item);
5858 5858 inline_size = btrfs_file_extent_inline_item_len(leaf,
5859   - btrfs_item_nr(leaf, path->slots[0]));
  5859 + btrfs_item_nr(path->slots[0]));
5860 5860 tmp = kmalloc(inline_size, GFP_NOFS);
5861 5861 if (!tmp)
5862 5862 return -ENOMEM;
fs/btrfs/print-tree.c
Diff comments   View file @ dd3cc16
... ... @@ -193,7 +193,7 @@
193 193 btrfs_info(root->fs_info, "leaf %llu total ptrs %d free space %d",
194 194 btrfs_header_bytenr(l), nr, btrfs_leaf_free_space(root, l));
195 195 for (i = 0 ; i < nr ; i++) {
196   - item = btrfs_item_nr(l, i);
  196 + item = btrfs_item_nr(i);
197 197 btrfs_item_key_to_cpu(l, &key, i);
198 198 type = btrfs_key_type(&key);
199 199 printk(KERN_INFO "\titem %d key (%llu %u %llu) itemoff %d "
... ... @@ -791,7 +791,7 @@
791 791 if (found_key->type == BTRFS_INODE_REF_KEY) {
792 792 ptr = (unsigned long)btrfs_item_ptr(eb, slot,
793 793 struct btrfs_inode_ref);
794   - item = btrfs_item_nr(eb, slot);
  794 + item = btrfs_item_nr(slot);
795 795 total = btrfs_item_size(eb, item);
796 796 elem_size = sizeof(*iref);
797 797 } else {
... ... @@ -905,7 +905,7 @@
905 905  
906 906 eb = path->nodes[0];
907 907 slot = path->slots[0];
908   - item = btrfs_item_nr(eb, slot);
  908 + item = btrfs_item_nr(slot);
909 909 di = btrfs_item_ptr(eb, slot, struct btrfs_dir_item);
910 910 cur = 0;
911 911 len = 0;