Skip to content

Commit 5dc3964

Browse files
josefbacikkdave
josefbacik
authored and
kdave
committed
btrfs-progs: remove the _nr from the item helpers
Now that all callers are using the _nr variations we can simply rename these helpers to btrfs_item_##member/btrfs_set_item_##member and change the actual item SETGET funcs to raw_item_##member/set_raw_item_##member and then change all callers to drop the _nr part. Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent f3be0ff commit 5dc3964

22 files changed

+206
-214
lines changed

‎btrfs-corrupt-block.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ static int corrupt_extent(struct btrfs_trans_handle *trans,
246246
"corrupting extent record: key %llu %u %llu\n",
247247
key.objectid, key.type, key.offset);
248248
ptr = btrfs_item_ptr_offset(leaf, slot);
249-
item_size = btrfs_item_size_nr(leaf, slot);
249+
item_size = btrfs_item_size(leaf, slot);
250250
memset_extent_buffer(leaf, 0, ptr, item_size);
251251
btrfs_mark_buffer_dirty(leaf);
252252
}
@@ -827,18 +827,18 @@ static void shift_items(struct btrfs_root *root, struct extent_buffer *eb)
827827
int shift_space = btrfs_leaf_free_space(eb) / 2;
828828
int slot = nritems / 2;
829829
int i = 0;
830-
unsigned int data_end = btrfs_item_offset_nr(eb, nritems - 1);
830+
unsigned int data_end = btrfs_item_offset(eb, nritems - 1);
831831

832832
/* Shift the item data up to and including slot back by shift space */
833833
memmove_extent_buffer(eb, btrfs_leaf_data(eb) + data_end - shift_space,
834834
btrfs_leaf_data(eb) + data_end,
835-
btrfs_item_offset_nr(eb, slot - 1) - data_end);
835+
btrfs_item_offset(eb, slot - 1) - data_end);
836836

837837
/* Now update the item pointers. */
838838
for (i = nritems - 1; i >= slot; i--) {
839-
u32 offset = btrfs_item_offset_nr(eb, i);
839+
u32 offset = btrfs_item_offset(eb, i);
840840
offset -= shift_space;
841-
btrfs_set_item_offset_nr(eb, i, offset);
841+
btrfs_set_item_offset(eb, i, offset);
842842
}
843843
}
844844

@@ -978,9 +978,9 @@ static int corrupt_btrfs_item(struct btrfs_root *root, struct btrfs_key *key,
978978
ret = 0;
979979
switch (corrupt_field) {
980980
case BTRFS_ITEM_OFFSET:
981-
orig = btrfs_item_offset_nr(path->nodes[0], path->slots[0]);
981+
orig = btrfs_item_offset(path->nodes[0], path->slots[0]);
982982
bogus = generate_u32(orig);
983-
btrfs_set_item_offset_nr(path->nodes[0], path->slots[0], bogus);
983+
btrfs_set_item_offset(path->nodes[0], path->slots[0], bogus);
984984
break;
985985
default:
986986
ret = -EINVAL;
@@ -1082,7 +1082,7 @@ static int corrupt_item_nocow(struct btrfs_trans_handle *trans,
10821082
fprintf(stdout, "Corrupting key and data [%llu, %u, %llu].\n",
10831083
key.objectid, key.type, key.offset);
10841084
ptr = btrfs_item_ptr_offset(leaf, slot);
1085-
item_size = btrfs_item_size_nr(leaf, slot);
1085+
item_size = btrfs_item_size(leaf, slot);
10861086
memset_extent_buffer(leaf, 0, ptr, item_size);
10871087
btrfs_mark_buffer_dirty(leaf);
10881088
}

‎check/main.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,7 +1408,7 @@ static int process_dir_item(struct extent_buffer *eb,
14081408
return 0;
14091409

14101410
di = btrfs_item_ptr(eb, slot, struct btrfs_dir_item);
1411-
total = btrfs_item_size_nr(eb, slot);
1411+
total = btrfs_item_size(eb, slot);
14121412
while (cur < total) {
14131413
int ret;
14141414

@@ -1490,7 +1490,7 @@ static int process_inode_ref(struct extent_buffer *eb,
14901490
inode_cache = &active_node->inode_cache;
14911491

14921492
ref = btrfs_item_ptr(eb, slot, struct btrfs_inode_ref);
1493-
total = btrfs_item_size_nr(eb, slot);
1493+
total = btrfs_item_size(eb, slot);
14941494
while (cur < total) {
14951495
name_len = btrfs_inode_ref_name_len(eb, ref);
14961496
index = btrfs_inode_ref_index(eb, ref);
@@ -1539,7 +1539,7 @@ static int process_inode_extref(struct extent_buffer *eb,
15391539
inode_cache = &active_node->inode_cache;
15401540

15411541
extref = btrfs_item_ptr(eb, slot, struct btrfs_inode_extref);
1542-
total = btrfs_item_size_nr(eb, slot);
1542+
total = btrfs_item_size(eb, slot);
15431543
while (cur < total) {
15441544
name_len = btrfs_inode_extref_name_len(eb, extref);
15451545
index = btrfs_inode_extref_index(eb, extref);
@@ -4216,10 +4216,10 @@ static int swap_values(struct btrfs_root *root, struct btrfs_path *path,
42164216

42174217
btrfs_item_key_to_cpu(buf, &k1, slot);
42184218
btrfs_item_key_to_cpu(buf, &k2, slot + 1);
4219-
item1_offset = btrfs_item_offset_nr(buf, slot);
4220-
item2_offset = btrfs_item_offset_nr(buf, slot + 1);
4221-
item1_size = btrfs_item_size_nr(buf, slot);
4222-
item2_size = btrfs_item_size_nr(buf, slot + 1);
4219+
item1_offset = btrfs_item_offset(buf, slot);
4220+
item2_offset = btrfs_item_offset(buf, slot + 1);
4221+
item1_size = btrfs_item_size(buf, slot);
4222+
item2_size = btrfs_item_size(buf, slot + 1);
42234223

42244224
item1_data = malloc(item1_size);
42254225
if (!item1_data)
@@ -4238,10 +4238,10 @@ static int swap_values(struct btrfs_root *root, struct btrfs_path *path,
42384238
free(item1_data);
42394239
free(item2_data);
42404240

4241-
btrfs_set_item_offset_nr(buf, slot, item2_offset);
4242-
btrfs_set_item_offset_nr(buf, slot + 1, item1_offset);
4243-
btrfs_set_item_size_nr(buf, slot, item2_size);
4244-
btrfs_set_item_size_nr(buf, slot + 1, item1_size);
4241+
btrfs_set_item_offset(buf, slot, item2_offset);
4242+
btrfs_set_item_offset(buf, slot + 1, item1_offset);
4243+
btrfs_set_item_size(buf, slot, item2_size);
4244+
btrfs_set_item_size(buf, slot + 1, item1_size);
42454245

42464246
path->slots[0] = slot;
42474247
btrfs_set_item_key_unsafe(root, path, &k2);
@@ -4342,30 +4342,30 @@ static int fix_item_offset(struct btrfs_root *root, struct btrfs_path *path)
43424342
shift = BTRFS_LEAF_DATA_SIZE(gfs_info) -
43434343
btrfs_item_end(buf, i);
43444344
} else if (i > 0 && btrfs_item_end(buf, i) !=
4345-
btrfs_item_offset_nr(buf, i - 1)) {
4345+
btrfs_item_offset(buf, i - 1)) {
43464346
if (btrfs_item_end(buf, i) >
4347-
btrfs_item_offset_nr(buf, i - 1)) {
4347+
btrfs_item_offset(buf, i - 1)) {
43484348
ret = delete_bogus_item(root, path, buf, i);
43494349
if (!ret)
43504350
goto again;
43514351
fprintf(stderr, "items overlap, can't fix\n");
43524352
ret = -EIO;
43534353
break;
43544354
}
4355-
shift = btrfs_item_offset_nr(buf, i - 1) -
4355+
shift = btrfs_item_offset(buf, i - 1) -
43564356
btrfs_item_end(buf, i);
43574357
}
43584358
if (!shift)
43594359
continue;
43604360

43614361
printf("Shifting item nr %d by %u bytes in block %llu\n",
43624362
i, shift, (unsigned long long)buf->start);
4363-
offset = btrfs_item_offset_nr(buf, i);
4363+
offset = btrfs_item_offset(buf, i);
43644364
memmove_extent_buffer(buf,
43654365
btrfs_leaf_data(buf) + offset + shift,
43664366
btrfs_leaf_data(buf) + offset,
4367-
btrfs_item_size_nr(buf, i));
4368-
btrfs_set_item_offset_nr(buf, i, offset + shift);
4367+
btrfs_item_size(buf, i));
4368+
btrfs_set_item_offset(buf, i, offset + shift);
43694369
btrfs_mark_buffer_dirty(buf);
43704370
}
43714371

@@ -5403,7 +5403,7 @@ static int process_extent_item(struct btrfs_root *root,
54035403
unsigned long ptr;
54045404
int ret;
54055405
int type;
5406-
u32 item_size = btrfs_item_size_nr(eb, slot);
5406+
u32 item_size = btrfs_item_size(eb, slot);
54075407
u64 refs = 0;
54085408
u64 offset;
54095409
u64 num_bytes;
@@ -6077,7 +6077,7 @@ static int check_csum_root(struct btrfs_root *root)
60776077
path.slots[0]);
60786078
errors++;
60796079
}
6080-
num_entries = btrfs_item_size_nr(leaf, path.slots[0]) / csum_size;
6080+
num_entries = btrfs_item_size(leaf, path.slots[0]) / csum_size;
60816081
data_len = num_entries * gfs_info->sectorsize;
60826082

60836083
if (num_entries > max_entries) {
@@ -6459,7 +6459,7 @@ static int run_next_block(struct btrfs_root *root,
64596459
}
64606460
if (key.type == BTRFS_EXTENT_CSUM_KEY) {
64616461
total_csum_bytes +=
6462-
btrfs_item_size_nr(buf, i);
6462+
btrfs_item_size(buf, i);
64636463
continue;
64646464
}
64656465
if (key.type == BTRFS_CHUNK_ITEM_KEY) {
@@ -6552,11 +6552,11 @@ static int run_next_block(struct btrfs_root *root,
65526552
if (key.type != BTRFS_EXTENT_DATA_KEY)
65536553
continue;
65546554
/* Check itemsize before we continue */
6555-
if (btrfs_item_size_nr(buf, i) < inline_offset) {
6555+
if (btrfs_item_size(buf, i) < inline_offset) {
65566556
ret = -EUCLEAN;
65576557
error(
65586558
"invalid file extent item size, have %u expect (%lu, %u]",
6559-
btrfs_item_size_nr(buf, i),
6559+
btrfs_item_size(buf, i),
65606560
inline_offset,
65616561
BTRFS_LEAF_DATA_SIZE(gfs_info));
65626562
continue;
@@ -6568,12 +6568,12 @@ static int run_next_block(struct btrfs_root *root,
65686568
continue;
65696569

65706570
/* Prealloc/regular extent must have fixed item size */
6571-
if (btrfs_item_size_nr(buf, i) !=
6571+
if (btrfs_item_size(buf, i) !=
65726572
sizeof(struct btrfs_file_extent_item)) {
65736573
ret = -EUCLEAN;
65746574
error(
65756575
"invalid file extent item size, have %u expect %zu",
6576-
btrfs_item_size_nr(buf, i),
6576+
btrfs_item_size(buf, i),
65776577
sizeof(struct btrfs_file_extent_item));
65786578
continue;
65796579
}
@@ -9661,7 +9661,7 @@ static int build_roots_info_cache(void)
96619661

96629662
ei = btrfs_item_ptr(leaf, slot, struct btrfs_extent_item);
96639663
flags = btrfs_extent_flags(leaf, ei);
9664-
item_end = (unsigned long)ei + btrfs_item_size_nr(leaf, slot);
9664+
item_end = (unsigned long)ei + btrfs_item_size(leaf, slot);
96659665

96669666
if (found_key.type == BTRFS_EXTENT_ITEM_KEY &&
96679667
!(flags & BTRFS_EXTENT_FLAG_TREE_BLOCK))

‎check/mode-common.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ int check_prealloc_extent_written(u64 disk_bytenr, u64 num_bytes)
205205
/* First check all inline refs. */
206206
ei = btrfs_item_ptr(path.nodes[0], path.slots[0],
207207
struct btrfs_extent_item);
208-
item_size = btrfs_item_size_nr(path.nodes[0], path.slots[0]);
208+
item_size = btrfs_item_size(path.nodes[0], path.slots[0]);
209209
ptr = (unsigned long)(ei + 1);
210210
end = (unsigned long)ei + item_size;
211211
while (ptr < end) {
@@ -340,7 +340,7 @@ int count_csum_range(u64 start, u64 len, u64 *found)
340340
if (key.offset > start)
341341
start = key.offset;
342342

343-
size = btrfs_item_size_nr(leaf, path.slots[0]);
343+
size = btrfs_item_size(leaf, path.slots[0]);
344344
csum_end = key.offset + (size / csum_size) *
345345
gfs_info->sectorsize;
346346
if (csum_end > start) {
@@ -758,7 +758,7 @@ static int find_file_type_dir_index(struct btrfs_root *root, u64 ino, u64 dirid,
758758
if (filetype >= BTRFS_FT_MAX || filetype == BTRFS_FT_UNKNOWN)
759759
goto out;
760760
len = min_t(u32, BTRFS_NAME_LEN,
761-
btrfs_item_size_nr(path.nodes[0], path.slots[0]) - sizeof(*di));
761+
btrfs_item_size(path.nodes[0], path.slots[0]) - sizeof(*di));
762762
len = min_t(u32, len, btrfs_dir_name_len(path.nodes[0], di));
763763
read_extent_buffer(path.nodes[0], namebuf, (unsigned long)(di + 1), len);
764764
if (name_len != len || memcmp(namebuf, name, len))
@@ -802,7 +802,7 @@ static int find_file_type_dir_item(struct btrfs_root *root, u64 ino, u64 dirid,
802802
goto out;
803803

804804
cur = btrfs_item_ptr_offset(path.nodes[0], path.slots[0]);
805-
end = cur + btrfs_item_size_nr(path.nodes[0], path.slots[0]);
805+
end = cur + btrfs_item_size(path.nodes[0], path.slots[0]);
806806
while (cur < end) {
807807
di = (struct btrfs_dir_item *)cur;
808808
cur += btrfs_dir_name_len(path.nodes[0], di) + sizeof(*di);
@@ -817,7 +817,7 @@ static int find_file_type_dir_item(struct btrfs_root *root, u64 ino, u64 dirid,
817817
if (filetype >= BTRFS_FT_MAX || filetype == BTRFS_FT_UNKNOWN)
818818
continue;
819819
len = min_t(u32, BTRFS_NAME_LEN,
820-
btrfs_item_size_nr(path.nodes[0], path.slots[0]) -
820+
btrfs_item_size(path.nodes[0], path.slots[0]) -
821821
sizeof(*di));
822822
len = min_t(u32, len, btrfs_dir_name_len(path.nodes[0], di));
823823
read_extent_buffer(path.nodes[0], namebuf,
@@ -903,7 +903,7 @@ int detect_imode(struct btrfs_root *root, struct btrfs_path *path,
903903
case BTRFS_INODE_REF_KEY:
904904
/* The most accurate way to determine filetype */
905905
cur = btrfs_item_ptr_offset(leaf, slot);
906-
end = cur + btrfs_item_size_nr(leaf, slot);
906+
end = cur + btrfs_item_size(leaf, slot);
907907
while (cur < end) {
908908
iref = (struct btrfs_inode_ref *)cur;
909909
namelen = min_t(u32, end - cur - sizeof(&iref),

0 commit comments

Comments
 (0)