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

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
...@@ -3181,8 +3181,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode, ...@@ -3181,8 +3181,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,
/* inode.c */ /* inode.c */
struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode, struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,
struct page *page, size_t pg_offset, u64 start, u64 start, u64 len);
u64 len, int create);
noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,
u64 *orig_start, u64 *orig_block_len, u64 *orig_start, u64 *orig_block_len,
u64 *ram_bytes); u64 *ram_bytes);
......
...@@ -4259,8 +4259,7 @@ static struct extent_map *get_extent_skip_holes(struct inode *inode, ...@@ -4259,8 +4259,7 @@ static struct extent_map *get_extent_skip_holes(struct inode *inode,
if (len == 0) if (len == 0)
break; break;
len = ALIGN(len, sectorsize); len = ALIGN(len, sectorsize);
em = btrfs_get_extent_fiemap(BTRFS_I(inode), NULL, 0, offset, em = btrfs_get_extent_fiemap(BTRFS_I(inode), offset, len);
len, 0);
if (IS_ERR_OR_NULL(em)) if (IS_ERR_OR_NULL(em))
return em; return em;
......
...@@ -3218,8 +3218,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence) ...@@ -3218,8 +3218,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence)
&cached_state); &cached_state);
while (start < inode->i_size) { while (start < inode->i_size) {
em = btrfs_get_extent_fiemap(BTRFS_I(inode), NULL, 0, em = btrfs_get_extent_fiemap(BTRFS_I(inode), start, len);
start, len, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
ret = PTR_ERR(em); ret = PTR_ERR(em);
em = NULL; em = NULL;
......
...@@ -6945,9 +6945,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, ...@@ -6945,9 +6945,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
} }
struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode, struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,
struct page *page, u64 start, u64 len)
size_t pg_offset, u64 start, u64 len,
int create)
{ {
struct extent_map *em; struct extent_map *em;
struct extent_map *hole_em = NULL; struct extent_map *hole_em = NULL;
...@@ -6957,7 +6955,7 @@ struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode, ...@@ -6957,7 +6955,7 @@ struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,
u64 found_end; u64 found_end;
int err = 0; 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)) if (IS_ERR(em))
return em; return em;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment