On Tue, Jun 06, 2017 at 04:45:26PM -0700, Omar Sandoval wrote:
> From: Omar Sandoval <osandov@xxxxxx>
>
> There are a few places where we pass in a negative num_bytes, so make it
> signed for clarity. Also move it up in the file since later patches will
> need it there.
>
Reviewed-by: Liu Bo <bo.li.liu@xxxxxxxxxx>
-liubo
> Signed-off-by: Omar Sandoval <osandov@xxxxxx>
> ---
> fs/btrfs/extent-tree.c | 41 ++++++++++++++++++++---------------------
> 1 file changed, 20 insertions(+), 21 deletions(-)
>
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index e390451c72e6..7c01b4e9e3b6 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -766,6 +766,26 @@ static struct btrfs_space_info *__find_space_info(struct btrfs_fs_info *info,
> return NULL;
> }
>
> +static void add_pinned_bytes(struct btrfs_fs_info *fs_info, s64 num_bytes,
> + u64 owner, u64 root_objectid)
> +{
> + struct btrfs_space_info *space_info;
> + u64 flags;
> +
> + if (owner < BTRFS_FIRST_FREE_OBJECTID) {
> + if (root_objectid == BTRFS_CHUNK_TREE_OBJECTID)
> + flags = BTRFS_BLOCK_GROUP_SYSTEM;
> + else
> + flags = BTRFS_BLOCK_GROUP_METADATA;
> + } else {
> + flags = BTRFS_BLOCK_GROUP_DATA;
> + }
> +
> + space_info = __find_space_info(fs_info, flags);
> + BUG_ON(!space_info); /* Logic bug */
> + percpu_counter_add(&space_info->total_bytes_pinned, num_bytes);
> +}
> +
> /*
> * after adding space to the filesystem, we need to clear the full flags
> * on all the space infos.
> @@ -6793,27 +6813,6 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
> return 0;
> }
>
> -static void add_pinned_bytes(struct btrfs_fs_info *fs_info, u64 num_bytes,
> - u64 owner, u64 root_objectid)
> -{
> - struct btrfs_space_info *space_info;
> - u64 flags;
> -
> - if (owner < BTRFS_FIRST_FREE_OBJECTID) {
> - if (root_objectid == BTRFS_CHUNK_TREE_OBJECTID)
> - flags = BTRFS_BLOCK_GROUP_SYSTEM;
> - else
> - flags = BTRFS_BLOCK_GROUP_METADATA;
> - } else {
> - flags = BTRFS_BLOCK_GROUP_DATA;
> - }
> -
> - space_info = __find_space_info(fs_info, flags);
> - BUG_ON(!space_info); /* Logic bug */
> - percpu_counter_add(&space_info->total_bytes_pinned, num_bytes);
> -}
> -
> -
> static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
> struct btrfs_fs_info *info,
> struct btrfs_delayed_ref_node *node, u64 parent,
> --
> 2.13.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
