Commit fc4f21b1 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Make get_extent_t take btrfs_inode 



In addition to changing the signature, this patch also switches
all the functions which are used as an argument to also take btrfs_inode.
Namely those are: btrfs_get_extent and btrfs_get_extent_filemap.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1c8c9c52

fs/btrfs/ctree.h

+6 −6
Original line number Diff line number Diff line
@@ -3100,9 +3100,9 @@ struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode, 
						    int delay_iput);

void btrfs_wait_and_free_delalloc_work(struct btrfs_delalloc_work *work);



struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *page,

					   size_t pg_offset, u64 start, u64 len,

					   int create);

struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,

		struct page *page, size_t pg_offset, u64 start,

		u64 len, int create);

noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,

			      u64 *orig_start, u64 *orig_block_len,

			      u64 *ram_bytes);
@@ -3166,9 +3166,9 @@ void btrfs_destroy_cachep(void); 
long btrfs_ioctl_trans_end(struct file *file);

struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,

			 struct btrfs_root *root, int *was_new);

struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,

				    size_t pg_offset, u64 start, u64 end,

				    int create);

struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,

		struct page *page, size_t pg_offset,

		u64 start, u64 end, int create);

int btrfs_update_inode(struct btrfs_trans_handle *trans,

			      struct btrfs_root *root,

			      struct inode *inode);

fs/btrfs/disk-io.c

+3 −3
Original line number Diff line number Diff line
@@ -219,12 +219,12 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, 
 * extents on the btree inode are pretty simple, there's one extent

 * that covers the entire device

 */

static struct extent_map *btree_get_extent(struct inode *inode,

static struct extent_map *btree_get_extent(struct btrfs_inode *inode,

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

		int create)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct extent_map_tree *em_tree = &inode->extent_tree;

	struct extent_map *em;

	int ret;

fs/btrfs/extent_io.c

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

	}



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

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

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

		BUG_ON(*em_cached);

		atomic_inc(&em->refs);
@@ -3373,7 +3373,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, 
							 page_end, NULL, 1);

			break;

		}

		em = epd->get_extent(inode, page, pg_offset, cur,

		em = epd->get_extent(BTRFS_I(inode), page, pg_offset, cur,

				     end - cur + 1, 1);

		if (IS_ERR_OR_NULL(em)) {

			SetPageError(page);
@@ -4338,7 +4338,7 @@ static struct extent_map *get_extent_skip_holes(struct inode *inode, 
		if (len == 0)

			break;

		len = ALIGN(len, sectorsize);

		em = get_extent(inode, NULL, 0, offset, len, 0);

		em = get_extent(BTRFS_I(inode), NULL, 0, offset, len, 0);

		if (IS_ERR_OR_NULL(em))

			return em;

fs/btrfs/extent_io.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static inline int extent_compress_type(unsigned long bio_flags) 


struct extent_map_tree;



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

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

					  struct page *page,

					  size_t pg_offset,

					  u64 start, u64 len,

fs/btrfs/file.c

+4 −3
Original line number Diff line number Diff line
@@ -2341,7 +2341,7 @@ static int find_first_non_hole(struct inode *inode, u64 *start, u64 *len) 
	struct extent_map *em;

	int ret = 0;



	em = btrfs_get_extent(inode, NULL, 0, *start, *len, 0);

	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, *start, *len, 0);

	if (IS_ERR_OR_NULL(em)) {

		if (!em)

			ret = -ENOMEM;
@@ -2833,7 +2833,7 @@ static long btrfs_fallocate(struct file *file, int mode, 
	/* First, check if we exceed the qgroup limit */

	INIT_LIST_HEAD(&reserve_list);

	while (1) {

		em = btrfs_get_extent(inode, NULL, 0, cur_offset,

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

				      alloc_end - cur_offset, 0);

		if (IS_ERR_OR_NULL(em)) {

			if (!em)
@@ -2960,7 +2960,8 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence) 
			 &cached_state);



	while (start < inode->i_size) {

		em = btrfs_get_extent_fiemap(inode, NULL, 0, start, len, 0);

		em = btrfs_get_extent_fiemap(BTRFS_I(inode), NULL, 0,

				start, len, 0);

		if (IS_ERR(em)) {

			ret = PTR_ERR(em);

			em = NULL;