Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d9f824d authored by Omar Sandoval's avatar Omar Sandoval Committed by David Sterba
Browse files

Btrfs: make add_pinned_bytes() take an s64 num_bytes instead of u64 



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.

Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Tested-by: default avatarHolger Hoffstätte <holger@applied-asynchrony.com>
Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1164a9fb

fs/btrfs/extent-tree.c

+20 −21
Original line number Diff line number Diff line
@@ -767,6 +767,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.
@@ -6808,27 +6828,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,