Skip to content

Commit 7f396f5

Browse files
kdavekdave
committed
btrfs-progs: reorder key initializations
Use the objectid, type, offset natural order as it's more readable and we're used to read keys like that. Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 5a956bb commit 7f396f5

31 files changed

+81
-82
lines changed

‎check/main.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2753,8 +2753,8 @@ static int repair_inline_ram_bytes(struct btrfs_trans_handle *trans,
27532753
int ret;
27542754

27552755
key.objectid = rec->ino;
2756-
key.offset = 0;
27572756
key.type = BTRFS_EXTENT_DATA_KEY;
2757+
key.offset = 0;
27582758

27592759
ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
27602760
if (ret > 0)
@@ -2986,8 +2986,8 @@ static int repair_inode_gen_original(struct btrfs_trans_handle *trans,
29862986
int ret;
29872987

29882988
key.objectid = rec->ino;
2989-
key.offset = 0;
29902989
key.type = BTRFS_INODE_ITEM_KEY;
2990+
key.offset = 0;
29912991

29922992
ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
29932993
if (ret > 0) {
@@ -3875,12 +3875,12 @@ static int check_fs_roots(struct cache_tree *root_cache)
38753875
cache_tree_init(&wc.shared);
38763876

38773877
again:
3878-
key.offset = 0;
38793878
if (skip_root)
38803879
key.objectid = skip_root + 1;
38813880
else
38823881
key.objectid = 0;
38833882
key.type = BTRFS_ROOT_ITEM_KEY;
3883+
key.offset = 0;
38843884
ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0);
38853885
if (ret < 0) {
38863886
err = 1;
@@ -6885,8 +6885,8 @@ static int record_extent(struct btrfs_trans_handle *trans,
68856885
item_size += sizeof(*bi);
68866886

68876887
ins_key.objectid = rec->start;
6888-
ins_key.offset = rec->max_size;
68896888
ins_key.type = BTRFS_EXTENT_ITEM_KEY;
6889+
ins_key.offset = rec->max_size;
68906890

68916891
ret = btrfs_insert_empty_item(trans, extent_root, path,
68926892
&ins_key, item_size);
@@ -8853,9 +8853,9 @@ static int parse_tree_roots(struct list_head *normal_trees,
88538853
int slot;
88548854
int ret = 0;
88558855

8856-
key.offset = 0;
88578856
key.objectid = 0;
88588857
key.type = BTRFS_ROOT_ITEM_KEY;
8858+
key.offset = 0;
88598859
ret = btrfs_search_slot(NULL, gfs_info->tree_root, &key, &path, 0, 0);
88608860
if (ret < 0)
88618861
goto out;

‎check/mode-common.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ int count_csum_range(u64 start, u64 len, u64 *found)
314314
u16 csum_size = gfs_info->csum_size;
315315

316316
key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
317-
key.offset = start;
318317
key.type = BTRFS_EXTENT_CSUM_KEY;
318+
key.offset = start;
319319

320320
ret = btrfs_search_slot(NULL, csum_root, &key, &path, 0, 0);
321321
if (ret < 0)
@@ -417,8 +417,8 @@ static int get_highest_inode(struct btrfs_trans_handle *trans,
417417
int ret;
418418

419419
key.objectid = BTRFS_LAST_FREE_OBJECTID;
420-
key.offset = -1;
421420
key.type = BTRFS_INODE_ITEM_KEY;
421+
key.offset = -1;
422422
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
423423
if (ret == 1) {
424424
btrfs_item_key_to_cpu(path->nodes[0], &found_key,
@@ -745,8 +745,8 @@ static int find_file_type_dir_index(struct btrfs_root *root, u64 ino, u64 dirid,
745745
int ret;
746746

747747
key.objectid = dirid;
748-
key.offset = index;
749748
key.type = BTRFS_DIR_INDEX_KEY;
749+
key.offset = index;
750750

751751
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
752752
if (ret > 0) {
@@ -798,8 +798,8 @@ static int find_file_type_dir_item(struct btrfs_root *root, u64 ino, u64 dirid,
798798
int ret;
799799

800800
key.objectid = dirid;
801-
key.offset = btrfs_name_hash(name, name_len);
802801
key.type = BTRFS_DIR_INDEX_KEY;
802+
key.offset = btrfs_name_hash(name, name_len);
803803

804804
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
805805
if (ret > 0) {
@@ -1248,8 +1248,8 @@ static int fill_csum_tree_from_one_fs_root(struct btrfs_trans_handle *trans,
12481248
return -ENOMEM;
12491249

12501250
key.objectid = 0;
1251-
key.offset = 0;
12521251
key.type = 0;
1252+
key.offset = 0;
12531253
ret = btrfs_search_slot(NULL, cur_root, &key, &path, 0, 0);
12541254
if (ret < 0)
12551255
goto out;
@@ -1347,8 +1347,8 @@ static int fill_csum_tree_from_fs(struct btrfs_trans_handle *trans)
13471347
int ret = 0;
13481348

13491349
key.objectid = BTRFS_FS_TREE_OBJECTID;
1350-
key.offset = 0;
13511350
key.type = BTRFS_ROOT_ITEM_KEY;
1351+
key.offset = 0;
13521352
ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0);
13531353
if (ret < 0)
13541354
goto out;

‎check/mode-lowmem.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,8 @@ static int find_dir_index(struct btrfs_root *root, u64 dirid, u64 location_id,
838838

839839
/* search from the last index */
840840
key.objectid = dirid;
841-
key.offset = (u64)-1;
842841
key.type = BTRFS_DIR_INDEX_KEY;
842+
key.offset = (u64)-1;
843843

844844
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
845845
if (ret < 0)
@@ -3864,8 +3864,8 @@ static int is_tree_reloc_root(struct extent_buffer *eb)
38643864
int ret = 0;
38653865

38663866
key.objectid = BTRFS_TREE_RELOC_OBJECTID;
3867-
key.offset = owner;
38683867
key.type = BTRFS_ROOT_ITEM_KEY;
3868+
key.offset = owner;
38693869

38703870
tree_reloc_root = btrfs_read_fs_root_no_cache(gfs_info, &key);
38713871
if (IS_ERR(tree_reloc_root))
@@ -5483,8 +5483,8 @@ int check_fs_roots_lowmem(void)
54835483
int err = 0;
54845484

54855485
key.objectid = BTRFS_FS_TREE_OBJECTID;
5486-
key.offset = 0;
54875486
key.type = BTRFS_ROOT_ITEM_KEY;
5487+
key.offset = 0;
54885488

54895489
ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0);
54905490
if (ret < 0) {
@@ -5597,8 +5597,8 @@ int check_chunks_and_extents_lowmem(void)
55975597
err |= ret;
55985598

55995599
key.objectid = BTRFS_EXTENT_TREE_OBJECTID;
5600-
key.offset = 0;
56015600
key.type = BTRFS_ROOT_ITEM_KEY;
5601+
key.offset = 0;
56025602

56035603
ret = btrfs_search_slot(NULL, gfs_info->tree_root, &key, &path, 0, 0);
56045604
if (ret) {

‎check/qgroup-verify.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,9 +960,9 @@ static int load_quota_info(struct btrfs_fs_info *info)
960960
* items. The 2nd pass picks up relation items and glues them to their
961961
* respective count structures.
962962
*/
963-
key.offset = 0;
964963
key.objectid = search_relations ? 0 : BTRFS_QGROUP_RELATION_KEY;
965964
key.type = 0;
965+
key.offset = 0;
966966

967967
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
968968
if (ret < 0) {

‎check/repair.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@ static int populate_used_from_extent_root(struct btrfs_root *root,
227227
int slot;
228228
int ret;
229229

230-
key.offset = 0;
231230
key.objectid = 0;
232231
key.type = BTRFS_EXTENT_ITEM_KEY;
232+
key.offset = 0;
233233
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
234234
if (ret < 0)
235235
return ret;

‎cmds/filesystem-usage.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ static int load_chunk_info(int fd, struct array *chunkinfos)
161161
sk->tree_id = BTRFS_CHUNK_TREE_OBJECTID;
162162

163163
sk->min_objectid = 0;
164-
sk->max_objectid = (u64)-1;
165-
sk->max_type = 0;
166164
sk->min_type = (u8)-1;
167165
sk->min_offset = 0;
166+
sk->max_objectid = (u64)-1;
167+
sk->max_type = 0;
168168
sk->max_offset = (u64)-1;
169169
sk->min_transid = 0;
170170
sk->max_transid = (u64)-1;

‎cmds/inspect-dump-tree.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,9 +580,9 @@ static int cmd_inspect_dump_tree(const struct cmd_struct *cmd,
580580
goto close_root;
581581
}
582582

583-
key.offset = 0;
584583
key.objectid = 0;
585584
key.type = BTRFS_ROOT_ITEM_KEY;
585+
key.offset = 0;
586586
ret = btrfs_search_slot(NULL, tree_root_scan, &key, &path, 0, 0);
587587
if (ret < 0) {
588588
errno = -ret;

‎cmds/inspect.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -570,10 +570,10 @@ static int print_min_dev_size(int fd, u64 devid)
570570
sk = btrfs_tree_search_sk(&args);
571571
sk->tree_id = BTRFS_DEV_TREE_OBJECTID;
572572
sk->min_objectid = devid;
573-
sk->max_objectid = devid;
574-
sk->max_type = BTRFS_DEV_EXTENT_KEY;
575573
sk->min_type = BTRFS_DEV_EXTENT_KEY;
576574
sk->min_offset = 0;
575+
sk->max_objectid = devid;
576+
sk->max_type = BTRFS_DEV_EXTENT_KEY;
577577
sk->max_offset = (u64)-1;
578578
sk->min_transid = 0;
579579
sk->max_transid = (u64)-1;
@@ -980,10 +980,10 @@ static u64 fill_usage(int fd, u64 lstart)
980980
sk = btrfs_tree_search_sk(&args);
981981
sk->tree_id = BTRFS_EXTENT_TREE_OBJECTID;
982982
sk->min_objectid = lstart;
983-
sk->max_objectid = lstart;
984983
sk->min_type = BTRFS_BLOCK_GROUP_ITEM_KEY;
985-
sk->max_type = BTRFS_BLOCK_GROUP_ITEM_KEY;
986984
sk->min_offset = 0;
985+
sk->max_objectid = lstart;
986+
sk->max_type = BTRFS_BLOCK_GROUP_ITEM_KEY;
987987
sk->max_offset = (u64)-1;
988988
sk->max_transid = (u64)-1;
989989
sk->nr_items = 1;
@@ -1089,8 +1089,8 @@ static int cmd_inspect_list_chunks(const struct cmd_struct *cmd,
10891089
sk = btrfs_tree_search_sk(&args);
10901090
sk->tree_id = BTRFS_CHUNK_TREE_OBJECTID;
10911091
sk->min_objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
1092-
sk->max_objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
10931092
sk->min_type = BTRFS_CHUNK_ITEM_KEY;
1093+
sk->max_objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
10941094
sk->max_type = BTRFS_CHUNK_ITEM_KEY;
10951095
sk->max_offset = (u64)-1;
10961096
sk->max_transid = (u64)-1;

‎cmds/qgroup.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,9 +1354,9 @@ static int __qgroups_search(int fd, struct btrfs_tree_search_args *args,
13541354
* record the mins in sk so we can make sure the
13551355
* next search doesn't repeat this root
13561356
*/
1357+
sk->min_objectid = key.objectid;
13571358
sk->min_type = key.type;
13581359
sk->min_offset = key.offset;
1359-
sk->min_objectid = key.objectid;
13601360
}
13611361
sk->nr_items = 4096;
13621362
/*
@@ -1410,10 +1410,11 @@ int btrfs_qgroup_query(int fd, u64 qgroupid, struct btrfs_qgroup_stats *stats)
14101410
memset(&args, 0, sizeof(args));
14111411
sk = btrfs_tree_search_sk(&args);
14121412
sk->tree_id = BTRFS_QUOTA_TREE_OBJECTID;
1413+
sk->min_objectid = 0;
14131414
sk->min_type = BTRFS_QGROUP_INFO_KEY;
1414-
sk->max_type = BTRFS_QGROUP_LIMIT_KEY;
1415-
sk->max_objectid = 0;
14161415
sk->min_offset = qgroupid;
1416+
sk->max_objectid = 0;
1417+
sk->max_type = BTRFS_QGROUP_LIMIT_KEY;
14171418
sk->max_offset = qgroupid;
14181419
sk->max_transid = (u64)-1;
14191420
sk->nr_items = 4096;

‎cmds/rescue-chunk-recover.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,8 +592,8 @@ static int check_chunk_by_metadata(struct recover_control *rc,
592592
stripe = &chunk->stripes[i];
593593

594594
key.objectid = stripe->devid;
595-
key.offset = stripe->offset;
596595
key.type = BTRFS_DEV_EXTENT_KEY;
596+
key.offset = stripe->offset;
597597

598598
ret = btrfs_search_slot(NULL, dev_root, &key, &path, 0, 0);
599599
if (ret < 0) {
@@ -1016,8 +1016,8 @@ static int block_group_remove_all_extent_items(struct btrfs_trans_handle *trans,
10161016
root = btrfs_extent_root(fs_info, start);
10171017

10181018
key.objectid = start;
1019-
key.offset = 0;
10201019
key.type = BTRFS_EXTENT_ITEM_KEY;
1020+
key.offset = 0;
10211021
again:
10221022
ret = btrfs_search_slot(trans, root, &key, &path, -1, 1);
10231023
if (ret < 0)

0 commit comments

Comments
 (0)