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

btrfs: remove the wake argument from clear_extent_bits 



This is only used in the case that we are clearing EXTENT_LOCKED, so
infer this value from the bits passed in instead of taking it as an
argument.

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 c07d1004

fs/btrfs/extent-io-tree.c

+4 −3
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static struct extent_state *clear_state_bit(struct extent_io_tree *tree, 
 * This takes the tree lock, and returns 0 on success and < 0 on error.

 */

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

		       u32 bits, int wake, int delete,

		       u32 bits, int delete,

		       struct extent_state **cached_state,

		       gfp_t mask, struct extent_changeset *changeset)

{
@@ -568,6 +568,7 @@ int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	u64 last_end;

	int err;

	int clear = 0;

	int wake = (bits & EXTENT_LOCKED) ? 1 : 0;



	btrfs_debug_check_extent_io_range(tree, start, end);

	trace_btrfs_clear_extent_bit(tree, start, end - start + 1, bits);
@@ -1617,7 +1618,7 @@ int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, 
	 */

	ASSERT(!(bits & EXTENT_LOCKED));



	return __clear_extent_bit(tree, start, end, bits, 0, 0, NULL, GFP_NOFS,

	return __clear_extent_bit(tree, start, end, bits, 0, NULL, GFP_NOFS,

				  changeset);

}
@@ -1631,7 +1632,7 @@ int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end) 
	if (err == -EEXIST) {

		if (failed_start > start)

			clear_extent_bit(tree, start, failed_start - 1,

					 EXTENT_LOCKED, 1, 0, NULL);

					 EXTENT_LOCKED, 0, NULL);

		return 0;

	}

	return 1;

fs/btrfs/extent-io-tree.h

+14 −20
Original line number Diff line number Diff line
@@ -121,46 +121,40 @@ int test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, 
int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,

			     u32 bits, struct extent_changeset *changeset);

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

		     u32 bits, int wake, int delete,

		     struct extent_state **cached, gfp_t mask,

		     struct extent_changeset *changeset);

		       u32 bits, int delete, struct extent_state **cached,

		       gfp_t mask, struct extent_changeset *changeset);



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

				   u64 end, u32 bits, int wake, int delete,

				   u64 end, u32 bits, int delete,

				   struct extent_state **cached)

{

	return __clear_extent_bit(tree, start, end, bits, wake, delete,

				  cached, GFP_NOFS, NULL);

	return __clear_extent_bit(tree, start, end, bits, delete, cached,

				  GFP_NOFS, NULL);

}



static inline int unlock_extent(struct extent_io_tree *tree, u64 start, u64 end)

{

	return clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, NULL);

	return clear_extent_bit(tree, start, end, EXTENT_LOCKED, 0, NULL);

}



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

		u64 end, struct extent_state **cached)

{

	return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, cached,

	return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, 0, cached,

				  GFP_NOFS, NULL);

}



static inline int unlock_extent_cached_atomic(struct extent_io_tree *tree,

		u64 start, u64 end, struct extent_state **cached)

{

	return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, cached,

	return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, 0, cached,

				  GFP_ATOMIC, NULL);

}



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

				    u64 end, u32 bits)

{

	int wake = 0;



	if (bits & EXTENT_LOCKED)

		wake = 1;



	return clear_extent_bit(tree, start, end, bits, wake, 0, NULL);

	return clear_extent_bit(tree, start, end, bits, 0, NULL);

}



int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
@@ -187,7 +181,7 @@ static inline int set_extent_bits(struct extent_io_tree *tree, u64 start, 
static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,

		u64 end, struct extent_state **cached_state)

{

	return __clear_extent_bit(tree, start, end, EXTENT_UPTODATE, 0, 0,

	return __clear_extent_bit(tree, start, end, EXTENT_UPTODATE, 0,

				  cached_state, GFP_NOFS, NULL);

}
@@ -203,7 +197,7 @@ static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start, 
{

	return clear_extent_bit(tree, start, end,

				EXTENT_DIRTY | EXTENT_DELALLOC |

				EXTENT_DO_ACCOUNTING, 0, 0, cached);

				EXTENT_DO_ACCOUNTING, 0, cached);

}



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

fs/btrfs/extent_io.c

+2 −2
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end, 
				  struct page *locked_page,

				  u32 clear_bits, unsigned long page_ops)

{

	clear_extent_bit(&inode->io_tree, start, end, clear_bits, 1, 0, NULL);

	clear_extent_bit(&inode->io_tree, start, end, clear_bits, 0, NULL);



	__process_pages_contig(inode->vfs_inode.i_mapping, locked_page,

			       start, end, page_ops, NULL);
@@ -3399,7 +3399,7 @@ static int try_release_extent_state(struct extent_io_tree *tree, 
		 */

		ret = __clear_extent_bit(tree, start, end,

			 ~(EXTENT_LOCKED | EXTENT_NODATASUM | EXTENT_DELALLOC_NEW),

			 0, 0, NULL, mask, NULL);

			 0, NULL, mask, NULL);



		/* if clear_extent_bit failed for enomem reasons,

		 * we can't allow the release to continue.

fs/btrfs/extent_map.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static void extent_map_device_clear_bits(struct extent_map *em, unsigned bits) 


		__clear_extent_bit(&device->alloc_state, stripe->physical,

				   stripe->physical + stripe_size - 1, bits,

				   0, 0, NULL, GFP_NOWAIT, NULL);

				   0, NULL, GFP_NOWAIT, NULL);

	}

}

fs/btrfs/file-item.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int btrfs_inode_clear_file_extent_range(struct btrfs_inode *inode, u64 start, 
	if (btrfs_fs_incompat(inode->root->fs_info, NO_HOLES))

		return 0;

	return clear_extent_bit(&inode->file_extent_tree, start,

				start + len - 1, EXTENT_DIRTY, 0, 0, NULL);

				start + len - 1, EXTENT_DIRTY, 0, NULL);

}



static inline u32 max_ordered_sum_bytes(struct btrfs_fs_info *fs_info,