diff options
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 091c4d35671b..b61801ac052a 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -535,7 +535,7 @@ static noinline int create_subvol(struct inode *dir, | |||
| 535 | 535 | ||
| 536 | key.objectid = objectid; | 536 | key.objectid = objectid; |
| 537 | key.offset = 0; | 537 | key.offset = 0; |
| 538 | btrfs_set_key_type(&key, BTRFS_ROOT_ITEM_KEY); | 538 | key.type = BTRFS_ROOT_ITEM_KEY; |
| 539 | ret = btrfs_insert_root(trans, root->fs_info->tree_root, &key, | 539 | ret = btrfs_insert_root(trans, root->fs_info->tree_root, &key, |
| 540 | &root_item); | 540 | &root_item); |
| 541 | if (ret) | 541 | if (ret) |
| @@ -3252,11 +3252,11 @@ process_slot: | |||
| 3252 | slot = path->slots[0]; | 3252 | slot = path->slots[0]; |
| 3253 | 3253 | ||
| 3254 | btrfs_item_key_to_cpu(leaf, &key, slot); | 3254 | btrfs_item_key_to_cpu(leaf, &key, slot); |
| 3255 | if (btrfs_key_type(&key) > BTRFS_EXTENT_DATA_KEY || | 3255 | if (key.type > BTRFS_EXTENT_DATA_KEY || |
| 3256 | key.objectid != btrfs_ino(src)) | 3256 | key.objectid != btrfs_ino(src)) |
| 3257 | break; | 3257 | break; |
| 3258 | 3258 | ||
| 3259 | if (btrfs_key_type(&key) == BTRFS_EXTENT_DATA_KEY) { | 3259 | if (key.type == BTRFS_EXTENT_DATA_KEY) { |
| 3260 | struct btrfs_file_extent_item *extent; | 3260 | struct btrfs_file_extent_item *extent; |
| 3261 | int type; | 3261 | int type; |
| 3262 | u32 size; | 3262 | u32 size; |
