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

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

btrfs: drop gfp parameter from find_extent_buffer 



pass GFP_NOFS directly to kmem_cache_alloc

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 172ddd60

fs/btrfs/disk-io.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -963,7 +963,7 @@ struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root, 
	struct inode *btree_inode = root->fs_info->btree_inode;

	struct inode *btree_inode = root->fs_info->btree_inode;

	struct extent_buffer *eb;

	struct extent_buffer *eb;

	eb = find_extent_buffer(&BTRFS_I(btree_inode)->io_tree,

	eb = find_extent_buffer(&BTRFS_I(btree_inode)->io_tree,

				bytenr, blocksize, GFP_NOFS);

				bytenr, blocksize);

	return eb;

	return eb;

}

}
@@ -2696,7 +2696,7 @@ int btree_lock_page_hook(struct page *page) 
		goto out;

		goto out;





	len = page->private >> 2;

	len = page->private >> 2;

	eb = find_extent_buffer(io_tree, bytenr, len, GFP_NOFS);

	eb = find_extent_buffer(io_tree, bytenr, len);

	if (!eb)

	if (!eb)

		goto out;

		goto out;

fs/btrfs/extent_io.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -3377,8 +3377,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree, 
}

}





struct extent_buffer *find_extent_buffer(struct extent_io_tree *tree,

struct extent_buffer *find_extent_buffer(struct extent_io_tree *tree,

					 u64 start, unsigned long len,

					 u64 start, unsigned long len)

					  gfp_t mask)

{

{

	struct extent_buffer *eb;

	struct extent_buffer *eb;

fs/btrfs/extent_io.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -263,8 +263,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree, 
					  struct page *page0,

					  struct page *page0,

					  gfp_t mask);

					  gfp_t mask);

struct extent_buffer *find_extent_buffer(struct extent_io_tree *tree,

struct extent_buffer *find_extent_buffer(struct extent_io_tree *tree,

					 u64 start, unsigned long len,

					 u64 start, unsigned long len);

					  gfp_t mask);

void free_extent_buffer(struct extent_buffer *eb);

void free_extent_buffer(struct extent_buffer *eb);

int read_extent_buffer_pages(struct extent_io_tree *tree,

int read_extent_buffer_pages(struct extent_io_tree *tree,

			     struct extent_buffer *eb, u64 start, int wait,

			     struct extent_buffer *eb, u64 start, int wait,