Skip to content

Commit 247e2d2

Browse files
kdavekdave
committed
btrfs-progs: reorder key initialization
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 6bc641b commit 247e2d2

19 files changed

+44
-43
lines changed

‎check/main.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -2785,8 +2785,8 @@ static int repair_inline_ram_bytes(struct btrfs_trans_handle *trans,
27852785
int ret;
27862786

27872787
key.objectid = rec->ino;
2788-
key.offset = 0;
27892788
key.type = BTRFS_EXTENT_DATA_KEY;
2789+
key.offset = 0;
27902790

27912791
ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
27922792
if (ret > 0)
@@ -3018,8 +3018,8 @@ static int repair_inode_gen_original(struct btrfs_trans_handle *trans,
30183018
int ret;
30193019

30203020
key.objectid = rec->ino;
3021-
key.offset = 0;
30223021
key.type = BTRFS_INODE_ITEM_KEY;
3022+
key.offset = 0;
30233023

30243024
ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
30253025
if (ret > 0) {
@@ -3920,12 +3920,12 @@ static int check_fs_roots(struct cache_tree *root_cache)
39203920
cache_tree_init(&wc.shared);
39213921

39223922
again:
3923-
key.offset = 0;
39243923
if (skip_root)
39253924
key.objectid = skip_root + 1;
39263925
else
39273926
key.objectid = 0;
39283927
key.type = BTRFS_ROOT_ITEM_KEY;
3928+
key.offset = 0;
39293929
ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0);
39303930
if (ret < 0) {
39313931
err = 1;
@@ -6937,8 +6937,8 @@ static int record_extent(struct btrfs_trans_handle *trans,
69376937
item_size += sizeof(*bi);
69386938

69396939
ins_key.objectid = rec->start;
6940-
ins_key.offset = rec->max_size;
69416940
ins_key.type = BTRFS_EXTENT_ITEM_KEY;
6941+
ins_key.offset = rec->max_size;
69426942

69436943
ret = btrfs_insert_empty_item(trans, extent_root, path,
69446944
&ins_key, item_size);
@@ -8935,9 +8935,9 @@ static int parse_tree_roots(struct list_head *normal_trees,
89358935
int slot;
89368936
int ret = 0;
89378937

8938-
key.offset = 0;
89398938
key.objectid = 0;
89408939
key.type = BTRFS_ROOT_ITEM_KEY;
8940+
key.offset = 0;
89418941
ret = btrfs_search_slot(NULL, gfs_info->tree_root, &key, &path, 0, 0);
89428942
if (ret < 0)
89438943
goto out;

‎check/mode-common.c

+6-6
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) {
@@ -1255,8 +1255,8 @@ static int fill_csum_tree_from_one_fs_root(struct btrfs_trans_handle *trans,
12551255
return -ENOMEM;
12561256

12571257
key.objectid = 0;
1258-
key.offset = 0;
12591258
key.type = 0;
1259+
key.offset = 0;
12601260
ret = btrfs_search_slot(NULL, cur_root, &key, &path, 0, 0);
12611261
if (ret < 0)
12621262
goto out;
@@ -1354,8 +1354,8 @@ static int fill_csum_tree_from_fs(struct btrfs_trans_handle *trans)
13541354
int ret = 0;
13551355

13561356
key.objectid = BTRFS_FS_TREE_OBJECTID;
1357-
key.offset = 0;
13581357
key.type = BTRFS_ROOT_ITEM_KEY;
1358+
key.offset = 0;
13591359
ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0);
13601360
if (ret < 0)
13611361
goto out;

‎check/mode-lowmem.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,8 @@ static int find_dir_index(struct btrfs_root *root, u64 dirid, u64 location_id,
865865

866866
/* search from the last index */
867867
key.objectid = dirid;
868-
key.offset = (u64)-1;
869868
key.type = BTRFS_DIR_INDEX_KEY;
869+
key.offset = (u64)-1;
870870

871871
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
872872
if (ret < 0)
@@ -3935,8 +3935,8 @@ static int is_tree_reloc_root(struct extent_buffer *eb)
39353935
int ret = 0;
39363936

39373937
key.objectid = BTRFS_TREE_RELOC_OBJECTID;
3938-
key.offset = owner;
39393938
key.type = BTRFS_ROOT_ITEM_KEY;
3939+
key.offset = owner;
39403940

39413941
tree_reloc_root = btrfs_read_fs_root_no_cache(gfs_info, &key);
39423942
if (IS_ERR(tree_reloc_root))
@@ -5556,8 +5556,8 @@ int check_fs_roots_lowmem(void)
55565556
int err = 0;
55575557

55585558
key.objectid = BTRFS_FS_TREE_OBJECTID;
5559-
key.offset = 0;
55605559
key.type = BTRFS_ROOT_ITEM_KEY;
5560+
key.offset = 0;
55615561

55625562
ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0);
55635563
if (ret < 0) {
@@ -5670,8 +5670,8 @@ int check_chunks_and_extents_lowmem(void)
56705670
err |= ret;
56715671

56725672
key.objectid = BTRFS_EXTENT_TREE_OBJECTID;
5673-
key.offset = 0;
56745673
key.type = BTRFS_ROOT_ITEM_KEY;
5674+
key.offset = 0;
56755675

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

‎check/qgroup-verify.c

+1-1
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

+1-1
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

+2-2
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

+1-1
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

+5-5
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

+4-3
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

+2-2
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)

‎cmds/restore.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1167,9 +1167,9 @@ static int do_list_roots(struct btrfs_root *root)
11671167

11681168
root = root->fs_info->tree_root;
11691169

1170-
key.offset = 0;
11711170
key.objectid = 0;
11721171
key.type = BTRFS_ROOT_ITEM_KEY;
1172+
key.offset = 0;
11731173
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
11741174
if (ret < 0) {
11751175
error("failed search next root item: %d", ret);

‎cmds/subvolume.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -972,9 +972,9 @@ static u64 find_root_gen(int fd)
972972
* them.
973973
*/
974974
sk->min_objectid = ino_args.treeid;
975+
sk->min_type = BTRFS_ROOT_ITEM_KEY;
975976
sk->max_objectid = ino_args.treeid;
976977
sk->max_type = BTRFS_ROOT_ITEM_KEY;
977-
sk->min_type = BTRFS_ROOT_ITEM_KEY;
978978
sk->max_offset = (u64)-1;
979979
sk->max_transid = (u64)-1;
980980
sk->nr_items = 4096;

‎common/extent-tree-utils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ static int __btrfs_record_file_extent(struct btrfs_trans_handle *trans,
221221
}
222222
btrfs_release_path(path);
223223
ins_key.objectid = objectid;
224-
ins_key.offset = file_pos;
225224
ins_key.type = BTRFS_EXTENT_DATA_KEY;
225+
ins_key.offset = file_pos;
226226
ret = btrfs_insert_empty_item(trans, root, path, &ins_key, sizeof(*fi));
227227
if (ret)
228228
goto fail;

‎common/fsfeatures.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -730,10 +730,10 @@ int btrfs_tree_search2_ioctl_supported(int fd)
730730
*/
731731
sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
732732
sk->min_objectid = BTRFS_EXTENT_TREE_OBJECTID;
733-
sk->max_objectid = BTRFS_EXTENT_TREE_OBJECTID;
734733
sk->min_type = BTRFS_ROOT_ITEM_KEY;
735-
sk->max_type = BTRFS_ROOT_ITEM_KEY;
736734
sk->min_offset = 0;
735+
sk->max_objectid = BTRFS_EXTENT_TREE_OBJECTID;
736+
sk->max_type = BTRFS_ROOT_ITEM_KEY;
737737
sk->max_offset = (u64)-1;
738738
sk->min_transid = 0;
739739
sk->max_transid = (u64)-1;

‎common/send-utils.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ static int btrfs_read_root_item_raw(int mnt_fd, u64 root_id, size_t buf_len,
8080
* them.
8181
*/
8282
sk->min_objectid = root_id;
83+
sk->min_type = BTRFS_ROOT_ITEM_KEY;
8384
sk->max_objectid = root_id;
8485
sk->max_type = BTRFS_ROOT_ITEM_KEY;
85-
sk->min_type = BTRFS_ROOT_ITEM_KEY;
8686
sk->max_offset = (u64)-1;
8787
sk->max_transid = (u64)-1;
8888
sk->nr_items = 4096;
@@ -210,8 +210,8 @@ static int btrfs_subvolid_resolve_sub(int fd, char *path, size_t *path_len,
210210
sk = btrfs_tree_search_sk(&args);
211211
sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
212212
sk->min_objectid = subvol_id;
213-
sk->max_objectid = subvol_id;
214213
sk->min_type = BTRFS_ROOT_BACKREF_KEY;
214+
sk->max_objectid = subvol_id;
215215
sk->max_type = BTRFS_ROOT_BACKREF_KEY;
216216
sk->max_offset = (u64)-1;
217217
sk->max_transid = (u64)-1;

‎common/utils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ static int search_chunk_tree_for_fs_info(int fd,
154154
sk = btrfs_tree_search_sk(&args);
155155
sk->tree_id = BTRFS_CHUNK_TREE_OBJECTID;
156156
sk->min_objectid = BTRFS_DEV_ITEMS_OBJECTID;
157-
sk->max_objectid = BTRFS_DEV_ITEMS_OBJECTID;
158157
sk->min_type = BTRFS_DEV_ITEM_KEY;
158+
sk->max_objectid = BTRFS_DEV_ITEMS_OBJECTID;
159159
sk->max_type = BTRFS_DEV_ITEM_KEY;
160160
sk->min_transid = 0;
161161
sk->max_transid = (u64)-1;

‎convert/main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1274,8 +1274,8 @@ static int do_convert(const char *devname, u32 convert_flags, u32 nodesize,
12741274
snprintf(subvol_name, sizeof(subvol_name), "%s_saved",
12751275
cctx.convert_ops->name);
12761276
key.objectid = CONV_IMAGE_SUBVOL_OBJECTID;
1277-
key.offset = (u64)-1;
12781277
key.type = BTRFS_ROOT_ITEM_KEY;
1278+
key.offset = (u64)-1;
12791279
image_root = btrfs_read_fs_root(root->fs_info, &key);
12801280
if (!image_root) {
12811281
error("unable to create image subvolume");
@@ -1486,8 +1486,8 @@ static int check_convert_image(struct btrfs_root *image_root, u64 ino,
14861486
int ret;
14871487

14881488
key.objectid = ino;
1489-
key.offset = 0;
14901489
key.type = BTRFS_EXTENT_DATA_KEY;
1490+
key.offset = 0;
14911491

14921492
ret = btrfs_search_slot(NULL, image_root, &key, &path, 0, 0);
14931493
/*

‎convert/source-fs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ int convert_insert_dirent(struct btrfs_trans_handle *trans,
188188
struct btrfs_inode_item dummy_iitem = { 0 };
189189
struct btrfs_key location = {
190190
.objectid = objectid,
191-
.offset = 0,
192191
.type = BTRFS_INODE_ITEM_KEY,
192+
.offset = 0,
193193
};
194194

195195
ret = btrfs_insert_dir_item(trans, root, name, name_len,

0 commit comments

Comments
 (0)