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

btrfs: remove btrfs_clear_extent_bits() 



It's just a simple wrapper around btrfs_clear_extent_bit() that passes a
NULL for its last argument (a cached extent state record), plus there is
not counter part - we have a btrfs_set_extent_bit() but we do not have a
btrfs_set_extent_bits() (plural version). So just remove it and make all
callers use btrfs_clear_extent_bit() directly.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
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 279b4db1

fs/btrfs/block-group.c

+6 −6
Original line number Diff line number Diff line
@@ -832,8 +832,8 @@ static int load_extent_tree_free(struct btrfs_caching_control *caching_ctl) 


static inline void btrfs_free_excluded_extents(const struct btrfs_block_group *bg)

{

	btrfs_clear_extent_bits(&bg->fs_info->excluded_extents, bg->start,

				bg->start + bg->length - 1, EXTENT_DIRTY);

	btrfs_clear_extent_bit(&bg->fs_info->excluded_extents, bg->start,

			       bg->start + bg->length - 1, EXTENT_DIRTY, NULL);

}



static noinline void caching_thread(struct btrfs_work *work)
@@ -1436,14 +1436,14 @@ static bool clean_pinned_extents(struct btrfs_trans_handle *trans, 
	 */

	mutex_lock(&fs_info->unused_bg_unpin_mutex);

	if (prev_trans) {

		ret = btrfs_clear_extent_bits(&prev_trans->pinned_extents, start, end,

					      EXTENT_DIRTY);

		ret = btrfs_clear_extent_bit(&prev_trans->pinned_extents, start, end,

					     EXTENT_DIRTY, NULL);

		if (ret)

			goto out;

	}



	ret = btrfs_clear_extent_bits(&trans->transaction->pinned_extents, start, end,

				      EXTENT_DIRTY);

	ret = btrfs_clear_extent_bit(&trans->transaction->pinned_extents, start, end,

				     EXTENT_DIRTY, NULL);

out:

	mutex_unlock(&fs_info->unused_bg_unpin_mutex);

	if (prev_trans)

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -4641,7 +4641,7 @@ static void btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info, 


	while (btrfs_find_first_extent_bit(dirty_pages, start, &start, &end,

					   mark, NULL)) {

		btrfs_clear_extent_bits(dirty_pages, start, end, mark);

		btrfs_clear_extent_bit(dirty_pages, start, end, mark, NULL);

		while (start <= end) {

			eb = find_extent_buffer(fs_info, start);

			start += fs_info->nodesize;

fs/btrfs/extent-io-tree.h

+0 −6
Original line number Diff line number Diff line
@@ -192,12 +192,6 @@ static inline int btrfs_unlock_extent(struct extent_io_tree *tree, u64 start, u6 
						cached, NULL);

}



static inline int btrfs_clear_extent_bits(struct extent_io_tree *tree, u64 start,

					  u64 end, u32 bits)

{

	return btrfs_clear_extent_bit(tree, start, end, bits, NULL);

}



int btrfs_set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,

				 u32 bits, struct extent_changeset *changeset);

int btrfs_set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -3374,8 +3374,8 @@ bool btrfs_data_csum_ok(struct btrfs_bio *bbio, struct btrfs_device *dev, 
	    btrfs_test_range_bit(&inode->io_tree, file_offset, end, EXTENT_NODATASUM,

				 NULL)) {

		/* Skip the range without csum for data reloc inode */

		btrfs_clear_extent_bits(&inode->io_tree, file_offset, end,

					EXTENT_NODATASUM);

		btrfs_clear_extent_bit(&inode->io_tree, file_offset, end,

				       EXTENT_NODATASUM, NULL);

		return true;

	}

fs/btrfs/qgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -4116,8 +4116,8 @@ static int qgroup_unreserve_range(struct btrfs_inode *inode, 
		 * Now the entry is in [start, start + len), revert the

		 * EXTENT_QGROUP_RESERVED bit.

		 */

		clear_ret = btrfs_clear_extent_bits(&inode->io_tree, entry_start,

						    entry_end, EXTENT_QGROUP_RESERVED);

		clear_ret = btrfs_clear_extent_bit(&inode->io_tree, entry_start, entry_end,

						   EXTENT_QGROUP_RESERVED, NULL);

		if (!ret && clear_ret < 0)

			ret = clear_ret;