|
@@ -744,12 +744,12 @@ static struct btrfs_space_info *__find_space_info(struct btrfs_fs_info *info,
|
|
}
|
|
}
|
|
|
|
|
|
static void add_pinned_bytes(struct btrfs_fs_info *fs_info, s64 num_bytes,
|
|
static void add_pinned_bytes(struct btrfs_fs_info *fs_info, s64 num_bytes,
|
|
- u64 owner, u64 root_objectid)
|
|
|
|
|
|
+ bool metadata, u64 root_objectid)
|
|
{
|
|
{
|
|
struct btrfs_space_info *space_info;
|
|
struct btrfs_space_info *space_info;
|
|
u64 flags;
|
|
u64 flags;
|
|
|
|
|
|
- if (owner < BTRFS_FIRST_FREE_OBJECTID) {
|
|
|
|
|
|
+ if (metadata) {
|
|
if (root_objectid == BTRFS_CHUNK_TREE_OBJECTID)
|
|
if (root_objectid == BTRFS_CHUNK_TREE_OBJECTID)
|
|
flags = BTRFS_BLOCK_GROUP_SYSTEM;
|
|
flags = BTRFS_BLOCK_GROUP_SYSTEM;
|
|
else
|
|
else
|
|
@@ -2200,8 +2200,11 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
|
|
&old_ref_mod, &new_ref_mod);
|
|
&old_ref_mod, &new_ref_mod);
|
|
}
|
|
}
|
|
|
|
|
|
- if (ret == 0 && old_ref_mod < 0 && new_ref_mod >= 0)
|
|
|
|
- add_pinned_bytes(fs_info, -num_bytes, owner, root_objectid);
|
|
|
|
|
|
+ if (ret == 0 && old_ref_mod < 0 && new_ref_mod >= 0) {
|
|
|
|
+ bool metadata = owner < BTRFS_FIRST_FREE_OBJECTID;
|
|
|
|
+
|
|
|
|
+ add_pinned_bytes(fs_info, -num_bytes, metadata, root_objectid);
|
|
|
|
+ }
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
@@ -7266,7 +7269,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,
|
|
}
|
|
}
|
|
out:
|
|
out:
|
|
if (pin)
|
|
if (pin)
|
|
- add_pinned_bytes(fs_info, buf->len, btrfs_header_level(buf),
|
|
|
|
|
|
+ add_pinned_bytes(fs_info, buf->len, true,
|
|
root->root_key.objectid);
|
|
root->root_key.objectid);
|
|
|
|
|
|
if (last_ref) {
|
|
if (last_ref) {
|
|
@@ -7320,8 +7323,11 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans,
|
|
&old_ref_mod, &new_ref_mod);
|
|
&old_ref_mod, &new_ref_mod);
|
|
}
|
|
}
|
|
|
|
|
|
- if (ret == 0 && old_ref_mod >= 0 && new_ref_mod < 0)
|
|
|
|
- add_pinned_bytes(fs_info, num_bytes, owner, root_objectid);
|
|
|
|
|
|
+ if (ret == 0 && old_ref_mod >= 0 && new_ref_mod < 0) {
|
|
|
|
+ bool metadata = owner < BTRFS_FIRST_FREE_OBJECTID;
|
|
|
|
+
|
|
|
|
+ add_pinned_bytes(fs_info, num_bytes, metadata, root_objectid);
|
|
|
|
+ }
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|