diff options
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r-- | fs/btrfs/volumes.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 76acd1d235e4..e21130d3f98a 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -1475,7 +1475,7 @@ next_slot: | |||
1475 | goto error; | 1475 | goto error; |
1476 | leaf = path->nodes[0]; | 1476 | leaf = path->nodes[0]; |
1477 | btrfs_item_key_to_cpu(leaf, &key, path->slots[0]); | 1477 | btrfs_item_key_to_cpu(leaf, &key, path->slots[0]); |
1478 | btrfs_release_path(root, path); | 1478 | btrfs_release_path(path); |
1479 | continue; | 1479 | continue; |
1480 | } | 1480 | } |
1481 | 1481 | ||
@@ -1947,7 +1947,7 @@ again: | |||
1947 | chunk = btrfs_item_ptr(leaf, path->slots[0], | 1947 | chunk = btrfs_item_ptr(leaf, path->slots[0], |
1948 | struct btrfs_chunk); | 1948 | struct btrfs_chunk); |
1949 | chunk_type = btrfs_chunk_type(leaf, chunk); | 1949 | chunk_type = btrfs_chunk_type(leaf, chunk); |
1950 | btrfs_release_path(chunk_root, path); | 1950 | btrfs_release_path(path); |
1951 | 1951 | ||
1952 | if (chunk_type & BTRFS_BLOCK_GROUP_SYSTEM) { | 1952 | if (chunk_type & BTRFS_BLOCK_GROUP_SYSTEM) { |
1953 | ret = btrfs_relocate_chunk(chunk_root, chunk_tree, | 1953 | ret = btrfs_relocate_chunk(chunk_root, chunk_tree, |
@@ -2065,7 +2065,7 @@ int btrfs_balance(struct btrfs_root *dev_root) | |||
2065 | if (found_key.offset == 0) | 2065 | if (found_key.offset == 0) |
2066 | break; | 2066 | break; |
2067 | 2067 | ||
2068 | btrfs_release_path(chunk_root, path); | 2068 | btrfs_release_path(path); |
2069 | ret = btrfs_relocate_chunk(chunk_root, | 2069 | ret = btrfs_relocate_chunk(chunk_root, |
2070 | chunk_root->root_key.objectid, | 2070 | chunk_root->root_key.objectid, |
2071 | found_key.objectid, | 2071 | found_key.objectid, |
@@ -2137,7 +2137,7 @@ again: | |||
2137 | goto done; | 2137 | goto done; |
2138 | if (ret) { | 2138 | if (ret) { |
2139 | ret = 0; | 2139 | ret = 0; |
2140 | btrfs_release_path(root, path); | 2140 | btrfs_release_path(path); |
2141 | break; | 2141 | break; |
2142 | } | 2142 | } |
2143 | 2143 | ||
@@ -2146,7 +2146,7 @@ again: | |||
2146 | btrfs_item_key_to_cpu(l, &key, path->slots[0]); | 2146 | btrfs_item_key_to_cpu(l, &key, path->slots[0]); |
2147 | 2147 | ||
2148 | if (key.objectid != device->devid) { | 2148 | if (key.objectid != device->devid) { |
2149 | btrfs_release_path(root, path); | 2149 | btrfs_release_path(path); |
2150 | break; | 2150 | break; |
2151 | } | 2151 | } |
2152 | 2152 | ||
@@ -2154,14 +2154,14 @@ again: | |||
2154 | length = btrfs_dev_extent_length(l, dev_extent); | 2154 | length = btrfs_dev_extent_length(l, dev_extent); |
2155 | 2155 | ||
2156 | if (key.offset + length <= new_size) { | 2156 | if (key.offset + length <= new_size) { |
2157 | btrfs_release_path(root, path); | 2157 | btrfs_release_path(path); |
2158 | break; | 2158 | break; |
2159 | } | 2159 | } |
2160 | 2160 | ||
2161 | chunk_tree = btrfs_dev_extent_chunk_tree(l, dev_extent); | 2161 | chunk_tree = btrfs_dev_extent_chunk_tree(l, dev_extent); |
2162 | chunk_objectid = btrfs_dev_extent_chunk_objectid(l, dev_extent); | 2162 | chunk_objectid = btrfs_dev_extent_chunk_objectid(l, dev_extent); |
2163 | chunk_offset = btrfs_dev_extent_chunk_offset(l, dev_extent); | 2163 | chunk_offset = btrfs_dev_extent_chunk_offset(l, dev_extent); |
2164 | btrfs_release_path(root, path); | 2164 | btrfs_release_path(path); |
2165 | 2165 | ||
2166 | ret = btrfs_relocate_chunk(root, chunk_tree, chunk_objectid, | 2166 | ret = btrfs_relocate_chunk(root, chunk_tree, chunk_objectid, |
2167 | chunk_offset); | 2167 | chunk_offset); |
@@ -3813,7 +3813,7 @@ again: | |||
3813 | } | 3813 | } |
3814 | if (key.objectid == BTRFS_DEV_ITEMS_OBJECTID) { | 3814 | if (key.objectid == BTRFS_DEV_ITEMS_OBJECTID) { |
3815 | key.objectid = 0; | 3815 | key.objectid = 0; |
3816 | btrfs_release_path(root, path); | 3816 | btrfs_release_path(path); |
3817 | goto again; | 3817 | goto again; |
3818 | } | 3818 | } |
3819 | ret = 0; | 3819 | ret = 0; |