Commit 1d126800 authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop gfp from parameter extent state helpers 



Now that all extent state bit helpers effectively take the GFP_NOFS mask
(and GFP_NOWAIT is encoded in the bits) we can remove the parameter.
This reduces stack consumption in many functions and simplifies a lot of
code.

Net effect on module on a release build:

   text    data     bss     dec     hex filename
1250432   20985   16088 1287505  13a551 pre/btrfs.ko
1247074   20985   16088 1284147  139833 post/btrfs.ko

DELTA: -3358

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 62bc6047

fs/btrfs/block-group.c

+1 −1
Original line number Diff line number Diff line
@@ -3523,7 +3523,7 @@ int btrfs_update_block_group(struct btrfs_trans_handle *trans, 


			set_extent_bit(&trans->transaction->pinned_extents,

				       bytenr, bytenr + num_bytes - 1,

				       EXTENT_DIRTY, NULL, GFP_NOFS);

				       EXTENT_DIRTY, NULL);

		}



		spin_lock(&trans->transaction->dirty_bgs_lock);

fs/btrfs/defrag.c

+1 −2
Original line number Diff line number Diff line
@@ -1041,8 +1041,7 @@ static int defrag_one_locked_target(struct btrfs_inode *inode, 
			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |

			 EXTENT_DEFRAG, cached_state);

	set_extent_bit(&inode->io_tree, start, start + len - 1,

		       EXTENT_DELALLOC | EXTENT_DEFRAG,

		       cached_state, GFP_NOFS);

		       EXTENT_DELALLOC | EXTENT_DEFRAG, cached_state);



	/* Update the page status */

	for (i = start_index - first_index; i <= last_index - first_index; i++) {

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static int btrfs_set_target_alloc_state(struct btrfs_device *srcdev, 
				      &found_start, &found_end,

				      CHUNK_ALLOCATED, &cached_state)) {

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

				     found_end, CHUNK_ALLOCATED, NULL, GFP_NOFS);

				     found_end, CHUNK_ALLOCATED, NULL);

		if (ret)

			break;

		start = found_end + 1;

fs/btrfs/extent-io-tree.c

+13 −12
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ static void set_gfp_mask_from_bits(u32 *bits, gfp_t *mask) 
 */

int __clear_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)

		       struct extent_changeset *changeset)

{

	struct extent_state *state;

	struct extent_state *cached;
@@ -566,6 +566,7 @@ int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	int clear = 0;

	int wake;

	int delete = (bits & EXTENT_CLEAR_ALL_BITS);

	gfp_t mask;



	set_gfp_mask_from_bits(&bits, &mask);

	btrfs_debug_check_extent_io_range(tree, start, end);
@@ -964,7 +965,8 @@ bool btrfs_find_delalloc_range(struct extent_io_tree *tree, u64 *start, 


/*

 * Set some bits on a range in the tree.  This may require allocations or

 * sleeping, so the gfp mask is used to indicate what is allowed.

 * sleeping. By default all allocations use GFP_NOFS, use EXTENT_NOWAIT for

 * GFP_NOWAIT.

 *

 * If any of the exclusive bits are set, this will fail with -EEXIST if some

 * part of the range already has the desired bits set.  The extent_state of the
@@ -979,7 +981,7 @@ static int __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
			    u32 bits, u64 *failed_start,

			    struct extent_state **failed_state,

			    struct extent_state **cached_state,

			    struct extent_changeset *changeset, gfp_t mask)

			    struct extent_changeset *changeset)

{

	struct extent_state *state;

	struct extent_state *prealloc = NULL;
@@ -989,6 +991,7 @@ static int __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	u64 last_start;

	u64 last_end;

	u32 exclusive_bits = (bits & EXTENT_LOCKED);

	gfp_t mask;



	set_gfp_mask_from_bits(&bits, &mask);

	btrfs_debug_check_extent_io_range(tree, start, end);
@@ -1200,10 +1203,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)

		   u32 bits, struct extent_state **cached_state)

{

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

				cached_state, NULL, mask);

				cached_state, NULL);

}



/*
@@ -1699,8 +1702,7 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, 
	 */

	ASSERT(!(bits & EXTENT_LOCKED));



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

				changeset, GFP_NOFS);

	return __set_extent_bit(tree, start, end, bits, NULL, NULL, NULL, changeset);

}



int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
@@ -1712,8 +1714,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, NULL, GFP_NOFS,

				  changeset);

	return __clear_extent_bit(tree, start, end, bits, NULL, changeset);

}



int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end,
@@ -1723,7 +1724,7 @@ int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end, 
	u64 failed_start;



	err = __set_extent_bit(tree, start, end, EXTENT_LOCKED, &failed_start,

			       NULL, cached, NULL, GFP_NOFS);

			       NULL, cached, NULL);

	if (err == -EEXIST) {

		if (failed_start > start)

			clear_extent_bit(tree, start, failed_start - 1,
@@ -1745,7 +1746,7 @@ int lock_extent(struct extent_io_tree *tree, u64 start, u64 end, 
	u64 failed_start;



	err = __set_extent_bit(tree, start, end, EXTENT_LOCKED, &failed_start,

			       &failed_state, cached_state, NULL, GFP_NOFS);

			       &failed_state, cached_state, NULL);

	while (err == -EEXIST) {

		if (failed_start != start)

			clear_extent_bit(tree, start, failed_start - 1,
@@ -1755,7 +1756,7 @@ int lock_extent(struct extent_io_tree *tree, u64 start, u64 end, 
				&failed_state);

		err = __set_extent_bit(tree, start, end, EXTENT_LOCKED,

				       &failed_start, &failed_state,

				       cached_state, NULL, GFP_NOFS);

				       cached_state, NULL);

	}

	return err;

}

fs/btrfs/extent-io-tree.h

+5 −7
Original line number Diff line number Diff line
@@ -136,22 +136,20 @@ 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, struct extent_state **cached, gfp_t mask,

		       u32 bits, struct extent_state **cached,

		       struct extent_changeset *changeset);



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

				   u64 end, u32 bits,

				   struct extent_state **cached)

{

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

				  GFP_NOFS, NULL);

	return __clear_extent_bit(tree, start, end, bits, cached, NULL);

}



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

				struct extent_state **cached)

{

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

				  GFP_NOFS, NULL);

	return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, cached, NULL);

}



static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start,
@@ -163,13 +161,13 @@ 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);

		   u32 bits, struct extent_state **cached_state);



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,

				  cached_state, GFP_NOFS, NULL);

				  cached_state, NULL);

}



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