Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 210aa277 authored by David Sterba's avatar David Sterba
Browse files

btrfs: sink gfp parameter to convert_extent_bit 



Single caller passes GFP_NOFS. We can get rid of the
gfpflags_allow_blocking checks as NOFS can block but does not recurse to
filesystem through reclaim.

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

fs/btrfs/extent_io.c

+6 −6
Original line number Diff line number Diff line
@@ -1078,17 +1078,18 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
 * @bits:	the bits to set in this range

 * @clear_bits:	the bits to clear in this range

 * @cached_state:	state that we're going to cache

 * @mask:	the allocation mask

 *

 * This will go through and set bits for the given range.  If any states exist

 * already in this range they are set with the given bit and cleared of the

 * clear_bits.  This is only meant to be used by things that are mergeable, ie

 * converting from say DELALLOC to DIRTY.  This is not meant to be used with

 * boundary bits like LOCK.

 *

 * All allocations are done with GFP_NOFS.

 */

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

		       unsigned bits, unsigned clear_bits,

		       struct extent_state **cached_state, gfp_t mask)

		       struct extent_state **cached_state)

{

	struct extent_state *state;

	struct extent_state *prealloc = NULL;
@@ -1103,7 +1104,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	btrfs_debug_check_extent_io_range(tree, start, end);



again:

	if (!prealloc && gfpflags_allow_blocking(mask)) {

	if (!prealloc) {

		/*

		 * Best effort, don't worry if extent state allocation fails

		 * here for the first iteration. We might have a cached state
@@ -1111,7 +1112,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
		 * extent state allocations are needed. We'll only know this

		 * after locking the tree.

		 */

		prealloc = alloc_extent_state(mask);

		prealloc = alloc_extent_state(GFP_NOFS);

		if (!prealloc && !first_iteration)

			return -ENOMEM;

	}
@@ -1272,7 +1273,6 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	if (start > end)

		goto out;

	spin_unlock(&tree->lock);

	if (gfpflags_allow_blocking(mask))

	cond_resched();

	first_iteration = false;

	goto again;

fs/btrfs/extent_io.h

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start, 


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

		       unsigned bits, unsigned clear_bits,

		       struct extent_state **cached_state, gfp_t mask);

		       struct extent_state **cached_state);



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

		u64 end, struct extent_state **cached_state)

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root, 


		err = convert_extent_bit(dirty_pages, start, end,

					 EXTENT_NEED_WAIT,

					 mark, &cached_state, GFP_NOFS);

					 mark, &cached_state);

		/*

		 * convert_extent_bit can return -ENOMEM, which is most of the

		 * time a temporary error. So when it happens, ignore the error