Commit 39b07b5d authored by Omar Sandoval's avatar Omar Sandoval Committed by David Sterba
Browse files

btrfs: drop create parameter to btrfs_get_extent() 



We only pass this as 1 from __extent_writepage_io(). The parameter
basically means "pretend I didn't pass in a page". This is silly since
we can simply not pass in the page. Get rid of the parameter from
btrfs_get_extent(), and since it's used as a get_extent_t callback,
remove it from get_extent_t and btree_get_extent(), neither of which
need it.

While we're here, let's document btrfs_get_extent().

Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f95d713b

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -2875,7 +2875,7 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location, 
			 struct btrfs_root *root);

struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,

				    struct page *page, size_t pg_offset,

				    u64 start, u64 end, int create);

				    u64 start, u64 end);

int btrfs_update_inode(struct btrfs_trans_handle *trans,

			      struct btrfs_root *root,

			      struct inode *inode);

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -202,8 +202,8 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, 
 * that covers the entire device

 */

struct extent_map *btree_get_extent(struct btrfs_inode *inode,

		struct page *page, size_t pg_offset, u64 start, u64 len,

		int create)

				    struct page *page, size_t pg_offset,

				    u64 start, u64 len)

{

	struct extent_map_tree *em_tree = &inode->extent_tree;

	struct extent_map *em;

fs/btrfs/disk-io.h

+2 −2
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, 
int btree_lock_page_hook(struct page *page, void *data,

				void (*flush_fn)(void *));

struct extent_map *btree_get_extent(struct btrfs_inode *inode,

		struct page *page, size_t pg_offset, u64 start, u64 len,

		int create);

				    struct page *page, size_t pg_offset,

				    u64 start, u64 len);

int btrfs_get_num_tolerated_disk_barrier_failures(u64 flags);

int __init btrfs_end_io_wq_init(void);

void __cold btrfs_end_io_wq_exit(void);

fs/btrfs/extent_io.c

+3 −3
Original line number Diff line number Diff line
@@ -3043,7 +3043,7 @@ __get_extent_map(struct inode *inode, struct page *page, size_t pg_offset, 
		*em_cached = NULL;

	}



	em = get_extent(BTRFS_I(inode), page, pg_offset, start, len, 0);

	em = get_extent(BTRFS_I(inode), page, pg_offset, start, len);

	if (em_cached && !IS_ERR_OR_NULL(em)) {

		BUG_ON(*em_cached);

		refcount_inc(&em->refs);
@@ -3466,8 +3466,8 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, 
							     page_end, 1);

			break;

		}

		em = btrfs_get_extent(BTRFS_I(inode), page, pg_offset, cur,

				     end - cur + 1, 1);

		em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, cur,

				      end - cur + 1);

		if (IS_ERR_OR_NULL(em)) {

			SetPageError(page);

			ret = PTR_ERR_OR_ZERO(em);

fs/btrfs/extent_io.h

+2 −4
Original line number Diff line number Diff line
@@ -183,10 +183,8 @@ static inline int extent_compress_type(unsigned long bio_flags) 
struct extent_map_tree;



typedef struct extent_map *(get_extent_t)(struct btrfs_inode *inode,

					  struct page *page,

					  size_t pg_offset,

					  u64 start, u64 len,

					  int create);

					  struct page *page, size_t pg_offset,

					  u64 start, u64 len);



int try_release_extent_mapping(struct page *page, gfp_t mask);

int try_release_extent_buffer(struct page *page);

CRA Git | Maintained and supported by SUSTech CRA and CCSE