On Fri, Mar 30, 2018 at 12:58:47PM +0300, Nikolay Borisov wrote:
> add_pinned_bytes reallyc ares whether the bytes being pinned are either
> data or metadata. To that effect is checks whether the 'owner' argument
> is less than BTRFS_FIRST_FREE_OBJECTID (256). This works because
> owner can really have 2 types of values:
> a) For metadata extents it holds the level at which the parent is in
> the btree. This amounts to owner having the values 0-7
>
> b) In case of modifying data extentsi, owner is the inode number
> to which those extents belongs.
>
> Let's make this more explicit byt converting the owner parameter to a
> boolean value and either pass it directly when we know the type of
> extents we are working with (i.e. in btrfs_free_tree_block). In cases
> when the parent function can be called on both metadata/data extents
> perform the check in the caller. This hopefully makes the interface
> of add_pinned_bytes more intuitive.
Agreed, looks better with the bool.
>
> Signed-off-by: Nikolay Borisov <nbori...@suse.com>
Reviewed-by: David Sterba <dste...@suse.com>
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -756,12 +756,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,
> - u64 owner, u64 root_objectid)
> + bool metadata, u64 root_objectid)
> {
> struct btrfs_space_info *space_info;
> u64 flags;
>
> - if (owner < BTRFS_FIRST_FREE_OBJECTID) {
> + if (metadata) {
> if (root_objectid == BTRFS_CHUNK_TREE_OBJECTID)
> flags = BTRFS_BLOCK_GROUP_SYSTEM;
> else
> @@ -2212,8 +2212,10 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle
> *trans,
> &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;
Missing newline.
> + add_pinned_bytes(fs_info, -num_bytes, metadata, root_objectid);
> + }
>
> return ret;
> }
> @@ -7231,7 +7233,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle
> *trans,
> }
> out:
> 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);
>
> if (last_ref) {
> @@ -7285,8 +7287,10 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans,
> &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;
Missing newline.
> + add_pinned_bytes(fs_info, num_bytes, metadata, root_objectid);
> + }
>
> return ret;
> }
And a few typos in the changelog but I'll fix that, no need to resend.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
