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

btrfs: Remove unused arguments from btrfs_get_extent_fiemap 



This function is a simple wrapper over btrfs_get_extent that returns
either:

a) A real extent in the passed range or
b) Adjusted extent based on whether delalloc bytes are found backing up
   a hole.

To support these semantics it doesn't need the page/pg_offset/create
arguments which are passed to btrfs_get_extent in case an extent is to
be created. So simplify the function by removing the unused arguments.
No functional changes.

Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a0873490

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -3181,8 +3181,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode, 


/* inode.c */

struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,

		struct page *page, size_t pg_offset, u64 start,

		u64 len, int create);

					   u64 start, u64 len);

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

			      u64 *orig_start, u64 *orig_block_len,

			      u64 *ram_bytes);

fs/btrfs/extent_io.c

+1 −2
Original line number Diff line number Diff line
@@ -4259,8 +4259,7 @@ static struct extent_map *get_extent_skip_holes(struct inode *inode, 
		if (len == 0)

			break;

		len = ALIGN(len, sectorsize);

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

				len, 0);

		em = btrfs_get_extent_fiemap(BTRFS_I(inode), offset, len);

		if (IS_ERR_OR_NULL(em))

			return em;

fs/btrfs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -3218,8 +3218,7 @@ 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(BTRFS_I(inode), NULL, 0,

				start, len, 0);

		em = btrfs_get_extent_fiemap(BTRFS_I(inode), start, len);

		if (IS_ERR(em)) {

			ret = PTR_ERR(em);

			em = NULL;

fs/btrfs/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -6945,9 +6945,7 @@ out: 
}



struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,

		struct page *page,

		size_t pg_offset, u64 start, u64 len,

		int create)

					   u64 start, u64 len)

{

	struct extent_map *em;

	struct extent_map *hole_em = NULL;
@@ -6957,7 +6955,7 @@ struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode, 
	u64 found_end;

	int err = 0;



	em = btrfs_get_extent(inode, page, pg_offset, start, len, create);

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

	if (IS_ERR(em))

		return em;

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE