Commit 0acd32c2 authored by David Sterba's avatar David Sterba
Browse files

btrfs: open code set_extent_bits 



This helper calls set_extent_bit with two more parameters set to default
values, but otherwise it's purpose is not clear.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e85de967

fs/btrfs/dev-replace.c

+2 −2
Original line number Diff line number Diff line
@@ -795,8 +795,8 @@ static int btrfs_set_target_alloc_state(struct btrfs_device *srcdev, 
	while (!find_first_extent_bit(&srcdev->alloc_state, start,

				      &found_start, &found_end,

				      CHUNK_ALLOCATED, &cached_state)) {

		ret = set_extent_bits(&tgtdev->alloc_state, found_start,

				      found_end, CHUNK_ALLOCATED);

		ret = set_extent_bit(&tgtdev->alloc_state, found_start,

				     found_end, CHUNK_ALLOCATED, NULL, GFP_NOFS);

		if (ret)

			break;

		start = found_end + 1;

fs/btrfs/extent-io-tree.h

+0 −6
Original line number Diff line number Diff line
@@ -156,12 +156,6 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, 
int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

		   u32 bits, struct extent_state **cached_state, gfp_t mask);



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

		u64 end, u32 bits)

{

	return set_extent_bit(tree, start, end, bits, NULL, GFP_NOFS);

}



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

		u64 end, struct extent_state **cached_state)

{

fs/btrfs/extent-tree.c

+5 −5
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ int btrfs_add_excluded_extent(struct btrfs_fs_info *fs_info, 
			      u64 start, u64 num_bytes)

{

	u64 end = start + num_bytes - 1;

	set_extent_bits(&fs_info->excluded_extents, start, end,

			EXTENT_UPTODATE);

	set_extent_bit(&fs_info->excluded_extents, start, end,

		       EXTENT_UPTODATE, NULL, GFP_NOFS);

	return 0;

}
@@ -5981,9 +5981,9 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed) 
		ret = btrfs_issue_discard(device->bdev, start, len,

					  &bytes);

		if (!ret)

			set_extent_bits(&device->alloc_state, start,

			set_extent_bit(&device->alloc_state, start,

				       start + bytes - 1,

					CHUNK_TRIMMED);

				       CHUNK_TRIMMED, NULL, GFP_NOFS);

		mutex_unlock(&fs_info->chunk_mutex);



		if (ret)

fs/btrfs/file-item.c

+5 −5
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ int btrfs_inode_set_file_extent_range(struct btrfs_inode *inode, u64 start, 


	if (btrfs_fs_incompat(inode->root->fs_info, NO_HOLES))

		return 0;

	return set_extent_bits(&inode->file_extent_tree, start, start + len - 1,

			       EXTENT_DIRTY);

	return set_extent_bit(&inode->file_extent_tree, start, start + len - 1,

			      EXTENT_DIRTY, NULL, GFP_NOFS);

}



/*
@@ -438,9 +438,9 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio) 
			    BTRFS_DATA_RELOC_TREE_OBJECTID) {

				u64 file_offset = bbio->file_offset + bio_offset;



				set_extent_bits(&inode->io_tree, file_offset,

				set_extent_bit(&inode->io_tree, file_offset,

					       file_offset + sectorsize - 1,

						EXTENT_NODATASUM);

					       EXTENT_NODATASUM, NULL, GFP_NOFS);

			} else {

				btrfs_warn_rl(fs_info,

			"csum hole found for disk bytenr range [%llu, %llu)",

fs/btrfs/relocation.c

+6 −5
Original line number Diff line number Diff line
@@ -174,8 +174,9 @@ static void mark_block_processed(struct reloc_control *rc, 
	    in_range(node->bytenr, rc->block_group->start,

		     rc->block_group->length)) {

		blocksize = rc->extent_root->fs_info->nodesize;

		set_extent_bits(&rc->processed_blocks, node->bytenr,

				node->bytenr + blocksize - 1, EXTENT_DIRTY);

		set_extent_bit(&rc->processed_blocks, node->bytenr,

			       node->bytenr + blocksize - 1, EXTENT_DIRTY,

			       NULL, GFP_NOFS);

	}

	node->processed = 1;

}
@@ -3051,9 +3052,9 @@ static int relocate_one_page(struct inode *inode, struct file_ra_state *ra, 
			u64 boundary_end = boundary_start +

					   fs_info->sectorsize - 1;



			set_extent_bits(&BTRFS_I(inode)->io_tree,

			set_extent_bit(&BTRFS_I(inode)->io_tree,

				       boundary_start, boundary_end,

					EXTENT_BOUNDARY);

				       EXTENT_BOUNDARY, NULL, GFP_NOFS);

		}

		unlock_extent(&BTRFS_I(inode)->io_tree, clamped_start, clamped_end,

			      &cached_state);