diff options
Diffstat (limited to 'fs/btrfs/dir-item.c')
-rw-r--r-- | fs/btrfs/dir-item.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index a0691df5dcea..fc8df866e919 100644 --- 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, | |||
86 | BUG_ON(name_len + data_len > BTRFS_MAX_XATTR_SIZE(root)); | 86 | BUG_ON(name_len + data_len > BTRFS_MAX_XATTR_SIZE(root)); |
87 | 87 | ||
88 | key.objectid = objectid; | 88 | key.objectid = objectid; |
89 | btrfs_set_key_type(&key, BTRFS_XATTR_ITEM_KEY); | 89 | key.type = BTRFS_XATTR_ITEM_KEY; |
90 | key.offset = btrfs_name_hash(name, name_len); | 90 | key.offset = btrfs_name_hash(name, name_len); |
91 | 91 | ||
92 | data_size = sizeof(*dir_item) + name_len + data_len; | 92 | 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 | |||
137 | u32 data_size; | 137 | u32 data_size; |
138 | 138 | ||
139 | key.objectid = btrfs_ino(dir); | 139 | key.objectid = btrfs_ino(dir); |
140 | btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY); | 140 | key.type = BTRFS_DIR_ITEM_KEY; |
141 | key.offset = btrfs_name_hash(name, name_len); | 141 | key.offset = btrfs_name_hash(name, name_len); |
142 | 142 | ||
143 | path = btrfs_alloc_path(); | 143 | path = btrfs_alloc_path(); |
@@ -204,7 +204,7 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, | |||
204 | int cow = mod != 0; | 204 | int cow = mod != 0; |
205 | 205 | ||
206 | key.objectid = dir; | 206 | key.objectid = dir; |
207 | btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY); | 207 | key.type = BTRFS_DIR_ITEM_KEY; |
208 | 208 | ||
209 | key.offset = btrfs_name_hash(name, name_len); | 209 | key.offset = btrfs_name_hash(name, name_len); |
210 | 210 | ||
@@ -234,7 +234,7 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, | |||
234 | return -ENOMEM; | 234 | return -ENOMEM; |
235 | 235 | ||
236 | key.objectid = dir; | 236 | key.objectid = dir; |
237 | btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY); | 237 | key.type = BTRFS_DIR_ITEM_KEY; |
238 | key.offset = btrfs_name_hash(name, name_len); | 238 | key.offset = btrfs_name_hash(name, name_len); |
239 | 239 | ||
240 | ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); | 240 | ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); |
@@ -297,7 +297,7 @@ btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans, | |||
297 | int cow = mod != 0; | 297 | int cow = mod != 0; |
298 | 298 | ||
299 | key.objectid = dir; | 299 | key.objectid = dir; |
300 | btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY); | 300 | key.type = BTRFS_DIR_INDEX_KEY; |
301 | key.offset = objectid; | 301 | key.offset = objectid; |
302 | 302 | ||
303 | ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow); | 303 | 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, | |||
367 | int cow = mod != 0; | 367 | int cow = mod != 0; |
368 | 368 | ||
369 | key.objectid = dir; | 369 | key.objectid = dir; |
370 | btrfs_set_key_type(&key, BTRFS_XATTR_ITEM_KEY); | 370 | key.type = BTRFS_XATTR_ITEM_KEY; |
371 | key.offset = btrfs_name_hash(name, name_len); | 371 | key.offset = btrfs_name_hash(name, name_len); |
372 | ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow); | 372 | ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow); |
373 | if (ret < 0) | 373 | if (ret < 0) |