staging: nvec: drop owner assignment from platform_drivers

[karo-tx-linux.git] / fs / btrfs / dir-item.c

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index a0691df5dceaa9dfdb3100732bf82ee81793f32c..fc8df866e91988bdbcbee0d9e50f770ebd0de905 100644 (file)
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -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));
 
        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);
 
        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;
 
        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);
 
        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;
 
        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);
 
@@ -234,7 +234,7 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
                return -ENOMEM;
 
        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);
 
        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;
 
        key.objectid = dir;
-       btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY);
+       key.type = BTRFS_DIR_INDEX_KEY;
        key.offset = objectid;
 
        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;
 
        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);
        ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);
        if (ret < 0)