Commit 93ef6c23 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: remove variable to track trimmed bytes at btrfs_finish_extent_commit() 



We don't need to keep track of discarded (trimmed) bytes at
btrfs_finish_extent_commit() but we are declaring a local variable for
that and passing a reference to the btrfs_discard_extent() calls when we
are processing delete block groups. So instead pass NULL to
btrfs_discard_extent() and remove that variable.

Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 25983713

fs/btrfs/extent-tree.c

+2 −6
Original line number Diff line number Diff line
@@ -2875,14 +2875,10 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans) 
	 */

	deleted_bgs = &trans->transaction->deleted_bgs;

	list_for_each_entry_safe(block_group, tmp, deleted_bgs, bg_list) {

		u64 trimmed = 0;



		ret = -EROFS;

		if (!TRANS_ABORTED(trans))

			ret = btrfs_discard_extent(fs_info,

						   block_group->start,

						   block_group->length,

						   &trimmed);

			ret = btrfs_discard_extent(fs_info, block_group->start,

						   block_group->length, NULL);



		/*

		 * Not strictly necessary to lock, as the block_group should be