btrfs: remove the pg_offset parameter from btrfs_get_extent()

The parameter @pg_offset of btrfs_get_extent() is only utilized for
inlined extent, and we already have an ASSERT() and tree-checker, to
make sure we can only get inline extent at file offset 0.

Any invalid inline extent with non-zero file offset would be rejected by
tree-checker in the first place.

Thus the @pg_offset parameter is not really necessary, just remove it.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 7f7c5a92d2b8799ce9da6ec0800b053133692595..83d78a6f3aa2f3eed89a54765fc8a3d766810a70 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -490,8 +490,7 @@ struct inode *btrfs_iget_path(struct super_block *s, u64 ino,
                              struct btrfs_root *root, struct btrfs_path *path);
 struct inode *btrfs_iget(struct super_block *s, u64 ino, struct btrfs_root *root);
 struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
-                                   struct page *page, size_t pg_offset,
-                                   u64 start, u64 len);
+                                   struct page *page, u64 start, u64 len);
 int btrfs_update_inode(struct btrfs_trans_handle *trans,
                       struct btrfs_inode *inode);
 int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 8b4bef05e22217cfe43af497060889e0e5b02d0a..f40bf01b8430b037c44bd1ab7250137953193af1 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -970,8 +970,7 @@ void clear_page_extent_mapped(struct page *page)
        folio_detach_private(folio);
 }
 
-static struct extent_map *
-__get_extent_map(struct inode *inode, struct page *page, size_t pg_offset,
+static struct extent_map *__get_extent_map(struct inode *inode, struct page *page,
                 u64 start, u64 len, struct extent_map **em_cached)
 {
        struct extent_map *em;
@@ -988,7 +987,7 @@ __get_extent_map(struct inode *inode, struct page *page, size_t pg_offset,
                *em_cached = NULL;
        }
 
-       em = btrfs_get_extent(BTRFS_I(inode), page, pg_offset, start, len);
+       em = btrfs_get_extent(BTRFS_I(inode), page, start, len);
        if (em_cached && !IS_ERR(em)) {
                BUG_ON(*em_cached);
                refcount_inc(&em->refs);
@@ -1051,8 +1050,7 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,
                        end_page_read(page, true, cur, iosize);
                        break;
                }
-               em = __get_extent_map(inode, page, pg_offset, cur,
-                                     end - cur + 1, em_cached);
+               em = __get_extent_map(inode, page, cur, end - cur + 1, em_cached);
                if (IS_ERR(em)) {
                        unlock_extent(tree, cur, end, NULL);
                        end_page_read(page, false, cur, end + 1 - cur);
@@ -1371,7 +1369,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,
                        continue;
                }
 
-               em = btrfs_get_extent(inode, NULL, 0, cur, len);
+               em = btrfs_get_extent(inode, NULL, cur, len);
                if (IS_ERR(em)) {
                        ret = PTR_ERR_OR_ZERO(em);
                        goto out_error;

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 38dfcac4760990b2cde853cea8ef9876e6f3959a..f8e1a7ce3d39aed6440af719e76680e0a5d92baa 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2176,7 +2176,7 @@ static int find_first_non_hole(struct btrfs_inode *inode, u64 *start, u64 *len)
        struct extent_map *em;
        int ret = 0;
 
-       em = btrfs_get_extent(inode, NULL, 0,
+       em = btrfs_get_extent(inode, NULL,
                              round_down(*start, fs_info->sectorsize),
                              round_up(*len, fs_info->sectorsize));
        if (IS_ERR(em))
@@ -2835,7 +2835,7 @@ static int btrfs_zero_range_check_range_boundary(struct btrfs_inode *inode,
        int ret;
 
        offset = round_down(offset, sectorsize);
-       em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(inode, NULL, offset, sectorsize);
        if (IS_ERR(em))
                return PTR_ERR(em);
 
@@ -2866,7 +2866,7 @@ static int btrfs_zero_range(struct inode *inode,
        u64 bytes_to_reserve = 0;
        bool space_reserved = false;
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, alloc_start,
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, alloc_start,
                              alloc_end - alloc_start);
        if (IS_ERR(em)) {
                ret = PTR_ERR(em);
@@ -2909,8 +2909,7 @@ static int btrfs_zero_range(struct inode *inode,
 
        if (BTRFS_BYTES_TO_BLKS(fs_info, offset) ==
            BTRFS_BYTES_TO_BLKS(fs_info, offset + len - 1)) {
-               em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, alloc_start,
-                                     sectorsize);
+               em = btrfs_get_extent(BTRFS_I(inode), NULL, alloc_start, sectorsize);
                if (IS_ERR(em)) {
                        ret = PTR_ERR(em);
                        goto out;
@@ -3126,7 +3125,7 @@ static long btrfs_fallocate(struct file *file, int mode,
 
        /* First, check if we exceed the qgroup limit */
        while (cur_offset < alloc_end) {
-               em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, cur_offset,
+               em = btrfs_get_extent(BTRFS_I(inode), NULL, cur_offset,
                                      alloc_end - cur_offset);
                if (IS_ERR(em)) {
                        ret = PTR_ERR(em);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 4795738d5785bce730fad21b68a00ff729b97915..bbff11d946438798c63ce09ee5f2237268ef4bfe 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2632,7 +2632,7 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode,
                u64 em_len;
                int ret = 0;
 
-               em = btrfs_get_extent(inode, NULL, 0, search_start, search_len);
+               em = btrfs_get_extent(inode, NULL, search_start, search_len);
                if (IS_ERR(em))
                        return PTR_ERR(em);
 
@@ -4907,8 +4907,7 @@ int btrfs_cont_expand(struct btrfs_inode *inode, loff_t oldsize, loff_t size)
                                           &cached_state);
        cur_offset = hole_start;
        while (1) {
-               em = btrfs_get_extent(inode, NULL, 0, cur_offset,
-                                     block_end - cur_offset);
+               em = btrfs_get_extent(inode, NULL, cur_offset, block_end - cur_offset);
                if (IS_ERR(em)) {
                        err = PTR_ERR(em);
                        em = NULL;
@@ -6756,7 +6755,6 @@ static int read_inline_extent(struct btrfs_inode *inode, struct btrfs_path *path
  *
  * @inode:     file to search in
  * @page:      page to read extent data into if the extent is inline
- * @pg_offset: offset into @page to copy to
  * @start:     file offset
  * @len:       length of range starting at @start
  *
@@ -6770,8 +6768,7 @@ static int read_inline_extent(struct btrfs_inode *inode, struct btrfs_path *path
  * Return: ERR_PTR on error, non-NULL extent_map on success.
  */
 struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
-                                   struct page *page, size_t pg_offset,
-                                   u64 start, u64 len)
+                                   struct page *page, u64 start, u64 len)
 {
        struct btrfs_fs_info *fs_info = inode->root->fs_info;
        int ret = 0;
@@ -6914,7 +6911,6 @@ next:
                 * ensured by tree-checker and inline extent creation path.
                 * Thus all members representing file offsets should be zero.
                 */
-               ASSERT(pg_offset == 0);
                ASSERT(extent_start == 0);
                ASSERT(em->start == 0);
 
@@ -7555,7 +7551,7 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,
        if (ret < 0)
                goto err;
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, start, len);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, start, len);
        if (IS_ERR(em)) {
                ret = PTR_ERR(em);
                goto unlock_err;
@@ -10164,7 +10160,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter,
                cond_resched();
        }
 
-       em = btrfs_get_extent(inode, NULL, 0, start, lockend - start + 1);
+       em = btrfs_get_extent(inode, NULL, start, lockend - start + 1);
        if (IS_ERR(em)) {
                ret = PTR_ERR(em);
                goto out_unlock_extent;
@@ -10744,7 +10740,7 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file,
                struct btrfs_block_group *bg;
                u64 len = isize - start;
 
-               em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, start, len);
+               em = btrfs_get_extent(BTRFS_I(inode), NULL, start, len);
                if (IS_ERR(em)) {
                        ret = PTR_ERR(em);
                        goto out;

diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c
index 9957de9f7806d1db1133845805414cb73da41a24..99da9d34b77aed53255e9af745c42b0431ecd306 100644 (file)
--- a/fs/btrfs/tests/inode-tests.c
+++ b/fs/btrfs/tests/inode-tests.c
@@ -258,7 +258,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
 
        /* First with no extents */
        BTRFS_I(inode)->root = root;
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, sectorsize);
        if (IS_ERR(em)) {
                em = NULL;
                test_err("got an error when we shouldn't have");
@@ -278,7 +278,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
         */
        setup_file_extents(root, sectorsize);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, (u64)-1);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, (u64)-1);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -316,7 +316,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        offset = em->start + em->len;
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -339,7 +339,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        free_extent_map(em);
 
        /* Regular extent */
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -367,7 +367,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        free_extent_map(em);
 
        /* The next 3 are split extents */
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -396,7 +396,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        offset = em->start + em->len;
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -418,7 +418,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        offset = em->start + em->len;
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -452,7 +452,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        free_extent_map(em);
 
        /* Prealloc extent */
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -481,7 +481,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        free_extent_map(em);
 
        /* The next 3 are a half written prealloc extent */
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -511,7 +511,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        offset = em->start + em->len;
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -544,7 +544,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        offset = em->start + em->len;
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -579,7 +579,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        free_extent_map(em);
 
        /* Now for the compressed extent */
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -613,7 +613,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        free_extent_map(em);
 
        /* Split compressed extent */
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -648,7 +648,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        offset = em->start + em->len;
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -675,7 +675,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        offset = em->start + em->len;
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -710,7 +710,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        free_extent_map(em);
 
        /* A hole between regular extents but no hole extent */
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset + 6, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset + 6, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -737,7 +737,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        offset = em->start + em->len;
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, SZ_4M);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, SZ_4M);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -770,7 +770,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
        offset = em->start + em->len;
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -850,7 +850,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)
        insert_inode_item_key(root);
        insert_extent(root, sectorsize, sectorsize, sectorsize, 0, sectorsize,
                      sectorsize, BTRFS_FILE_EXTENT_REG, 0, 1);
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, 2 * sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 2 * sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;
@@ -872,7 +872,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)
        }
        free_extent_map(em);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, sectorsize, 2 * sectorsize);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, sectorsize, 2 * sectorsize);
        if (IS_ERR(em)) {
                test_err("got an error when we shouldn't have");
                goto out;