]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: remove the return value from submit_uncompressed_range
authorChristoph Hellwig <hch@lst.de>
Wed, 28 Jun 2023 15:31:28 +0000 (17:31 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 21 Aug 2023 12:52:14 +0000 (14:52 +0200)
The return value from submit_uncompressed_range is ignored, and that's
fine because the error reporting happens through the mapping and
ordered_extent.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/inode.c

index bd62985c352061c0e0b950e135d0b0e1bcee483d..dad0a6113a0435c3f34042b29a2fc9e4e983f1ee 100644 (file)
@@ -1124,9 +1124,9 @@ static void free_async_extent_pages(struct async_extent *async_extent)
        async_extent->pages = NULL;
 }
 
-static int submit_uncompressed_range(struct btrfs_inode *inode,
-                                    struct async_extent *async_extent,
-                                    struct page *locked_page)
+static void submit_uncompressed_range(struct btrfs_inode *inode,
+                                     struct async_extent *async_extent,
+                                     struct page *locked_page)
 {
        u64 start = async_extent->start;
        u64 end = async_extent->start + async_extent->ram_size - 1;
@@ -1151,7 +1151,7 @@ static int submit_uncompressed_range(struct btrfs_inode *inode,
                             &nr_written, NULL, true, false);
        /* Inline extent inserted, page gets unlocked and everything is done */
        if (page_started)
-               return 0;
+               return;
 
        if (ret < 0) {
                btrfs_cleanup_ordered_extents(inode, locked_page, start, end - start + 1);
@@ -1169,14 +1169,13 @@ static int submit_uncompressed_range(struct btrfs_inode *inode,
                        mapping_set_error(locked_page->mapping, ret);
                        unlock_page(locked_page);
                }
-               return ret;
+               return;
        }
 
        /* All pages will be unlocked, including @locked_page */
        wbc_attach_fdatawrite_inode(&wbc, &inode->vfs_inode);
-       ret = extent_write_locked_range(&inode->vfs_inode, start, end, &wbc);
+       extent_write_locked_range(&inode->vfs_inode, start, end, &wbc);
        wbc_detach_inode(&wbc);
-       return ret;
 }
 
 static void submit_one_async_extent(struct async_chunk *async_chunk,
@@ -1213,7 +1212,7 @@ static void submit_one_async_extent(struct async_chunk *async_chunk,
 
        /* We have fall back to uncompressed write */
        if (!async_extent->pages) {
-               ret = submit_uncompressed_range(inode, async_extent, locked_page);
+               submit_uncompressed_range(inode, async_extent, locked_page);
                goto done;
        }