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: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c
index 2be38df703c9..8ffa4783cbf4 100644
--- a/fs/btrfs/inode-item.c
+++ b/fs/btrfs/inode-item.c
@@ -135,7 +135,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,
         u32 item_size;
 
         key.objectid = inode_objectid;
-        btrfs_set_key_type(&key, BTRFS_INODE_EXTREF_KEY);
+        key.type = BTRFS_INODE_EXTREF_KEY;
         key.offset = btrfs_extref_hash(ref_objectid, name, name_len);
 
         path = btrfs_alloc_path();
@@ -209,7 +209,7 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans,
 
         key.objectid = inode_objectid;
         key.offset = ref_objectid;
-        btrfs_set_key_type(&key, BTRFS_INODE_REF_KEY);
+        key.type = BTRFS_INODE_REF_KEY;
 
         path = btrfs_alloc_path();
         if (!path)
@@ -337,7 +337,7 @@ int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans,
 
         key.objectid = inode_objectid;
         key.offset = ref_objectid;
-        btrfs_set_key_type(&key, BTRFS_INODE_REF_KEY);
+        key.type = BTRFS_INODE_REF_KEY;
 
         path = btrfs_alloc_path();
         if (!path)
@@ -400,7 +400,7 @@ int btrfs_insert_empty_inode(struct btrfs_trans_handle *trans,
         struct btrfs_key key;
         int ret;
         key.objectid = objectid;
-        btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
+        key.type = BTRFS_INODE_ITEM_KEY;
         key.offset = 0;
 
         ret = btrfs_insert_empty_item(trans, root, path, &key,
@@ -420,13 +420,13 @@ int btrfs_lookup_inode(struct btrfs_trans_handle *trans, struct btrfs_root
         struct btrfs_key found_key;
 
         ret = btrfs_search_slot(trans, root, location, path, ins_len, cow);
-        if (ret > 0 && btrfs_key_type(location) == BTRFS_ROOT_ITEM_KEY &&
+        if (ret > 0 && location->type == BTRFS_ROOT_ITEM_KEY &&
             location->offset == (u64)-1 && path->slots[0] != 0) {
                 slot = path->slots[0] - 1;
                 leaf = path->nodes[0];
                 btrfs_item_key_to_cpu(leaf, &found_key, slot);
                 if (found_key.objectid == location->objectid &&
-                    btrfs_key_type(&found_key) == btrfs_key_type(location)) {
+                    found_key.type == location->type) {
                         path->slots[0]--;
                         return 0;
                 }