diff options
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 59b3ea32b6de..7bf4a8d07e1e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -4085,7 +4085,6 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, | |||
4085 | struct inode *dir, u64 objectid, | 4085 | struct inode *dir, u64 objectid, |
4086 | const char *name, int name_len) | 4086 | const char *name, int name_len) |
4087 | { | 4087 | { |
4088 | struct btrfs_fs_info *fs_info = root->fs_info; | ||
4089 | struct btrfs_path *path; | 4088 | struct btrfs_path *path; |
4090 | struct extent_buffer *leaf; | 4089 | struct extent_buffer *leaf; |
4091 | struct btrfs_dir_item *di; | 4090 | struct btrfs_dir_item *di; |
@@ -4118,9 +4117,8 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, | |||
4118 | } | 4117 | } |
4119 | btrfs_release_path(path); | 4118 | btrfs_release_path(path); |
4120 | 4119 | ||
4121 | ret = btrfs_del_root_ref(trans, fs_info, objectid, | 4120 | ret = btrfs_del_root_ref(trans, objectid, root->root_key.objectid, |
4122 | root->root_key.objectid, dir_ino, | 4121 | dir_ino, &index, name, name_len); |
4123 | &index, name, name_len); | ||
4124 | if (ret < 0) { | 4122 | if (ret < 0) { |
4125 | if (ret != -ENOENT) { | 4123 | if (ret != -ENOENT) { |
4126 | btrfs_abort_transaction(trans, ret); | 4124 | btrfs_abort_transaction(trans, ret); |
@@ -6439,7 +6437,7 @@ fail_dir_item: | |||
6439 | if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) { | 6437 | if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) { |
6440 | u64 local_index; | 6438 | u64 local_index; |
6441 | int err; | 6439 | int err; |
6442 | err = btrfs_del_root_ref(trans, fs_info, key.objectid, | 6440 | err = btrfs_del_root_ref(trans, key.objectid, |
6443 | root->root_key.objectid, parent_ino, | 6441 | root->root_key.objectid, parent_ino, |
6444 | &local_index, name, name_len); | 6442 | &local_index, name, name_len); |
6445 | 6443 | ||