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

Commit f734c44a authored by David Sterba's avatar David Sterba
Browse files

btrfs: sink gfp parameter to clear_record_extent_bits 



Callers pass GFP_NOFS. No need to pass the flags around.

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

fs/btrfs/extent_io.c

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



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

{

	/*

	 * Don't support EXTENT_LOCKED case, same reason as
@@ -1317,7 +1316,7 @@ int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, 
	 */

	BUG_ON(bits & EXTENT_LOCKED);



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

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

				  changeset);

}

fs/btrfs/extent_io.h

+1 −2
Original line number Diff line number Diff line
@@ -221,8 +221,7 @@ int test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, 
		   unsigned bits, int filled,

		   struct extent_state *cached_state);

int clear_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 clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

		     unsigned bits, int wake, int delete,

		     struct extent_state **cached, gfp_t mask);

fs/btrfs/qgroup.c

+2 −3
Original line number Diff line number Diff line
@@ -2580,8 +2580,7 @@ static int __btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len, 
		return -ENOMEM;



	ret = clear_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);

	if (ret < 0)

		goto out;
@@ -2688,7 +2687,7 @@ void btrfs_qgroup_check_reserved_leak(struct inode *inode) 
		return;



	ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, 0, (u64)-1,

			EXTENT_QGROUP_RESERVED, GFP_NOFS, &changeset);

			EXTENT_QGROUP_RESERVED, &changeset);



	WARN_ON(ret < 0);

	if (WARN_ON(changeset.bytes_changed)) {