Commit 291bbb1e authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: drop extent_changeset from set_extent_bit 



The only places that set extent_changeset is set_record_extent_bits,
everywhere else sets it to NULL.  Drop this argument from
set_extent_bit.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 994bcd1e

fs/btrfs/extent-io-tree.c

+2 −3
Original line number Diff line number Diff line
@@ -1170,11 +1170,10 @@ static int __set_extent_bit(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,

		   struct extent_changeset *changeset)

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

{

	return __set_extent_bit(tree, start, end, bits, NULL, cached_state,

				changeset, mask);

				NULL, mask);

}



/*

fs/btrfs/extent-io-tree.h

+8 −10
Original line number Diff line number Diff line
@@ -160,19 +160,18 @@ static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start, 
int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,

			   u32 bits, struct extent_changeset *changeset);

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

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

		   struct extent_changeset *changeset);

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



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

					 u64 end, u32 bits)

{

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

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

}



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, NULL);

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

}



static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,
@@ -185,7 +184,7 @@ static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start, 
static inline int set_extent_dirty(struct extent_io_tree *tree, u64 start,

		u64 end, gfp_t mask)

{

	return set_extent_bit(tree, start, end, EXTENT_DIRTY, NULL, mask, NULL);

	return set_extent_bit(tree, start, end, EXTENT_DIRTY, NULL, mask);

}



static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start,
@@ -206,7 +205,7 @@ static inline int set_extent_delalloc(struct extent_io_tree *tree, u64 start, 
{

	return set_extent_bit(tree, start, end,

			      EXTENT_DELALLOC | extra_bits,

			      cached_state, GFP_NOFS, NULL);

			      cached_state, GFP_NOFS);

}



static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start,
@@ -214,21 +213,20 @@ static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start, 
{

	return set_extent_bit(tree, start, end,

			      EXTENT_DELALLOC | EXTENT_DEFRAG,

			      cached_state, GFP_NOFS, NULL);

			      cached_state, GFP_NOFS);

}



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

		u64 end)

{

	return set_extent_bit(tree, start, end, EXTENT_NEW, NULL, GFP_NOFS,

			      NULL);

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

}



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

		u64 end, struct extent_state **cached_state, gfp_t mask)

{

	return set_extent_bit(tree, start, end, EXTENT_UPTODATE,

			      cached_state, mask, NULL);

			      cached_state, mask);

}



int find_first_extent_bit(struct extent_io_tree *tree, u64 start,

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -2816,7 +2816,7 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode, 
		ret = set_extent_bit(&inode->io_tree, search_start,

				     search_start + em_len - 1,

				     EXTENT_DELALLOC_NEW, cached_state,

				     GFP_NOFS, NULL);

				     GFP_NOFS);

next:

		search_start = extent_map_end(em);

		free_extent_map(em);
@@ -4962,7 +4962,7 @@ int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len, 


	if (only_release_metadata)

		set_extent_bit(&inode->io_tree, block_start, block_end,

			       EXTENT_NORESERVE, NULL, GFP_NOFS, NULL);

			       EXTENT_NORESERVE, NULL, GFP_NOFS);



out_unlock:

	if (ret) {