btrfs: remove the return value from extent_write_locked_range
authorChristoph Hellwig <hch@lst.de>
Wed, 28 Jun 2023 15:31:29 +0000 (17:31 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 21 Aug 2023 12:52:14 +0000 (14:52 +0200)
The return value from extent_write_locked_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/extent_io.c
fs/btrfs/extent_io.h

index b99081a..4981058 100644 (file)
@@ -2180,11 +2180,10 @@ retry:
  * already been ran (aka, ordered extent inserted) and all pages are still
  * locked.
  */
-int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
-                             struct writeback_control *wbc)
+void extent_write_locked_range(struct inode *inode, u64 start, u64 end,
+                              struct writeback_control *wbc)
 {
        bool found_error = false;
-       int first_error = 0;
        int ret = 0;
        struct address_space *mapping = inode->i_mapping;
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
@@ -2234,20 +2233,14 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
                        mapping_set_error(page->mapping, ret);
                }
                btrfs_page_unlock_writer(fs_info, page, cur, cur_len);
-               if (ret < 0) {
+               if (ret < 0)
                        found_error = true;
-                       first_error = ret;
-               }
 next_page:
                put_page(page);
                cur = cur_end + 1;
        }
 
        submit_write_bio(&bio_ctrl, found_error ? ret : 0);
-
-       if (found_error)
-               return first_error;
-       return ret;
 }
 
 int extent_writepages(struct address_space *mapping,
index 8d11e17..0312022 100644 (file)
@@ -177,8 +177,8 @@ int try_release_extent_mapping(struct page *page, gfp_t mask);
 int try_release_extent_buffer(struct page *page);
 
 int btrfs_read_folio(struct file *file, struct folio *folio);
-int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
-                             struct writeback_control *wbc);
+void extent_write_locked_range(struct inode *inode, u64 start, u64 end,
+                              struct writeback_control *wbc);
 int extent_writepages(struct address_space *mapping,
                      struct writeback_control *wbc);
 int btree_write_cache_pages(struct address_space *mapping,