Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 962a298f authored by David Sterba's avatar David Sterba Committed by Chris Mason
Browse files

btrfs: kill the key type accessor helpers 



btrfs_set_key_type and btrfs_key_type are used inconsistently along with
open coded variants. Other members of btrfs_key are accessed directly
without any helpers anyway.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 3abdbd78

fs/btrfs/backref.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1193,7 +1193,7 @@ int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid, 
	unsigned long ptr;

	unsigned long ptr;





	key.objectid = inode_objectid;

	key.objectid = inode_objectid;

	btrfs_set_key_type(&key, BTRFS_INODE_EXTREF_KEY);

	key.type = BTRFS_INODE_EXTREF_KEY;

	key.offset = start_off;

	key.offset = start_off;





	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);

	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
@@ -1233,7 +1233,7 @@ int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid, 
		ret = -ENOENT;

		ret = -ENOENT;

		if (found_key.objectid != inode_objectid)

		if (found_key.objectid != inode_objectid)

			break;

			break;

		if (btrfs_key_type(&found_key) != BTRFS_INODE_EXTREF_KEY)

		if (found_key.type != BTRFS_INODE_EXTREF_KEY)

			break;

			break;





		ret = 0;

		ret = 0;

fs/btrfs/delayed-inode.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1042,7 +1042,7 @@ static int __btrfs_update_delayed_inode(struct btrfs_trans_handle *trans, 
	int ret;

	int ret;





	key.objectid = node->inode_id;

	key.objectid = node->inode_id;

	btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);

	key.type = BTRFS_INODE_ITEM_KEY;

	key.offset = 0;

	key.offset = 0;





	if (test_bit(BTRFS_DELAYED_NODE_DEL_IREF, &node->flags))

	if (test_bit(BTRFS_DELAYED_NODE_DEL_IREF, &node->flags))
@@ -1099,7 +1099,7 @@ static int __btrfs_update_delayed_inode(struct btrfs_trans_handle *trans, 
search:

search:

	btrfs_release_path(path);

	btrfs_release_path(path);





	btrfs_set_key_type(&key, BTRFS_INODE_EXTREF_KEY);

	key.type = BTRFS_INODE_EXTREF_KEY;

	key.offset = -1;

	key.offset = -1;

	ret = btrfs_search_slot(trans, root, &key, path, -1, 1);

	ret = btrfs_search_slot(trans, root, &key, path, -1, 1);

	if (ret < 0)

	if (ret < 0)
@@ -1473,7 +1473,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, 
	}

	}





	delayed_item->key.objectid = btrfs_ino(dir);

	delayed_item->key.objectid = btrfs_ino(dir);

	btrfs_set_key_type(&delayed_item->key, BTRFS_DIR_INDEX_KEY);

	delayed_item->key.type = BTRFS_DIR_INDEX_KEY;

	delayed_item->key.offset = index;

	delayed_item->key.offset = index;





	dir_item = (struct btrfs_dir_item *)delayed_item->data;

	dir_item = (struct btrfs_dir_item *)delayed_item->data;
@@ -1542,7 +1542,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 
		return PTR_ERR(node);

		return PTR_ERR(node);





	item_key.objectid = btrfs_ino(dir);

	item_key.objectid = btrfs_ino(dir);

	btrfs_set_key_type(&item_key, BTRFS_DIR_INDEX_KEY);

	item_key.type = BTRFS_DIR_INDEX_KEY;

	item_key.offset = index;

	item_key.offset = index;





	ret = btrfs_delete_delayed_insertion_item(root, node, &item_key);

	ret = btrfs_delete_delayed_insertion_item(root, node, &item_key);

fs/btrfs/dir-item.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans, 
	BUG_ON(name_len + data_len > BTRFS_MAX_XATTR_SIZE(root));

	BUG_ON(name_len + data_len > BTRFS_MAX_XATTR_SIZE(root));





	key.objectid = objectid;

	key.objectid = objectid;

	btrfs_set_key_type(&key, BTRFS_XATTR_ITEM_KEY);

	key.type = BTRFS_XATTR_ITEM_KEY;

	key.offset = btrfs_name_hash(name, name_len);

	key.offset = btrfs_name_hash(name, name_len);





	data_size = sizeof(*dir_item) + name_len + data_len;

	data_size = sizeof(*dir_item) + name_len + data_len;
@@ -137,7 +137,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root 
	u32 data_size;

	u32 data_size;





	key.objectid = btrfs_ino(dir);

	key.objectid = btrfs_ino(dir);

	btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);

	key.type = BTRFS_DIR_ITEM_KEY;

	key.offset = btrfs_name_hash(name, name_len);

	key.offset = btrfs_name_hash(name, name_len);





	path = btrfs_alloc_path();

	path = btrfs_alloc_path();
@@ -204,7 +204,7 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, 
	int cow = mod != 0;

	int cow = mod != 0;





	key.objectid = dir;

	key.objectid = dir;

	btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);

	key.type = BTRFS_DIR_ITEM_KEY;





	key.offset = btrfs_name_hash(name, name_len);

	key.offset = btrfs_name_hash(name, name_len);
@@ -234,7 +234,7 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, 
		return -ENOMEM;

		return -ENOMEM;





	key.objectid = dir;

	key.objectid = dir;

	btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);

	key.type = BTRFS_DIR_ITEM_KEY;

	key.offset = btrfs_name_hash(name, name_len);

	key.offset = btrfs_name_hash(name, name_len);





	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);

	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
@@ -297,7 +297,7 @@ btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans, 
	int cow = mod != 0;

	int cow = mod != 0;





	key.objectid = dir;

	key.objectid = dir;

	btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY);

	key.type = BTRFS_DIR_INDEX_KEY;

	key.offset = objectid;

	key.offset = objectid;





	ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);

	ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);
@@ -367,7 +367,7 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans, 
	int cow = mod != 0;

	int cow = mod != 0;





	key.objectid = dir;

	key.objectid = dir;

	btrfs_set_key_type(&key, BTRFS_XATTR_ITEM_KEY);

	key.type = BTRFS_XATTR_ITEM_KEY;

	key.offset = btrfs_name_hash(name, name_len);

	key.offset = btrfs_name_hash(name, name_len);

	ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);

	ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);

	if (ret < 0)

	if (ret < 0)

fs/btrfs/export.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, 
		return ERR_PTR(-ESTALE);

		return ERR_PTR(-ESTALE);





	key.objectid = root_objectid;

	key.objectid = root_objectid;

	btrfs_set_key_type(&key, BTRFS_ROOT_ITEM_KEY);

	key.type = BTRFS_ROOT_ITEM_KEY;

	key.offset = (u64)-1;

	key.offset = (u64)-1;





	index = srcu_read_lock(&fs_info->subvol_srcu);

	index = srcu_read_lock(&fs_info->subvol_srcu);
@@ -82,7 +82,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, 
	}

	}





	key.objectid = objectid;

	key.objectid = objectid;

	btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);

	key.type = BTRFS_INODE_ITEM_KEY;

	key.offset = 0;

	key.offset = 0;





	inode = btrfs_iget(sb, &key, root, NULL);

	inode = btrfs_iget(sb, &key, root, NULL);

fs/btrfs/extent-tree.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -3097,7 +3097,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans, 
	for (i = 0; i < nritems; i++) {

	for (i = 0; i < nritems; i++) {

		if (level == 0) {

		if (level == 0) {

			btrfs_item_key_to_cpu(buf, &key, i);

			btrfs_item_key_to_cpu(buf, &key, i);

			if (btrfs_key_type(&key) != BTRFS_EXTENT_DATA_KEY)

			if (key.type != BTRFS_EXTENT_DATA_KEY)

				continue;

				continue;

			fi = btrfs_item_ptr(buf, i,

			fi = btrfs_item_ptr(buf, i,

					    struct btrfs_file_extent_item);

					    struct btrfs_file_extent_item);
@@ -6464,7 +6464,7 @@ static noinline int find_free_extent(struct btrfs_root *orig_root, 
	bool have_caching_bg = false;

	bool have_caching_bg = false;





	WARN_ON(num_bytes < root->sectorsize);

	WARN_ON(num_bytes < root->sectorsize);

	btrfs_set_key_type(ins, BTRFS_EXTENT_ITEM_KEY);

	ins->type = BTRFS_EXTENT_ITEM_KEY;

	ins->objectid = 0;

	ins->objectid = 0;

	ins->offset = 0;

	ins->offset = 0;
@@ -9009,7 +9009,7 @@ int btrfs_read_block_groups(struct btrfs_root *root) 
	root = info->extent_root;

	root = info->extent_root;

	key.objectid = 0;

	key.objectid = 0;

	key.offset = 0;

	key.offset = 0;

	btrfs_set_key_type(&key, BTRFS_BLOCK_GROUP_ITEM_KEY);

	key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;

	path = btrfs_alloc_path();

	path = btrfs_alloc_path();

	if (!path)

	if (!path)

		return -ENOMEM;

		return -ENOMEM;