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

Commit 2c53b912 authored by David Sterba's avatar David Sterba
Browse files

btrfs: sink gfp parameter to set_record_extent_bits 



Single caller passes GFP_NOFS.

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

fs/btrfs/extent_io.c

+2 −3
Original line number Diff line number Diff line
@@ -1284,8 +1284,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 


/* wrappers around set/clear extent bit */

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

			   unsigned bits, gfp_t mask,

			   struct extent_changeset *changeset)

			   unsigned bits, struct extent_changeset *changeset)

{

	/*

	 * We don't support EXTENT_LOCKED yet, as current changeset will
@@ -1295,7 +1294,7 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, 
	 */

	BUG_ON(bits & EXTENT_LOCKED);



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

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

				changeset);

}

fs/btrfs/extent_io.h

+1 −2
Original line number Diff line number Diff line
@@ -252,8 +252,7 @@ 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,

			   unsigned bits, gfp_t mask,

			   struct extent_changeset *changeset);

			   unsigned bits, struct extent_changeset *changeset);

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

		   unsigned bits, u64 *failed_start,

		   struct extent_state **cached_state, gfp_t mask);

fs/btrfs/qgroup.c

+1 −2
Original line number Diff line number Diff line
@@ -2542,8 +2542,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode, u64 start, u64 len) 
	changeset.bytes_changed = 0;

	changeset.range_changed = ulist_alloc(GFP_NOFS);

	ret = set_record_extent_bits(&BTRFS_I(inode)->io_tree, start,

			start + len -1, EXTENT_QGROUP_RESERVED, GFP_NOFS,

			&changeset);

			start + len -1, EXTENT_QGROUP_RESERVED, &changeset);

	trace_btrfs_qgroup_reserve_data(inode, start, len,

					changeset.bytes_changed,

					QGROUP_RESERVE);