]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ext4: remove calls to to set/clear the folio error flag
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Sat, 20 Apr 2024 02:50:05 +0000 (03:50 +0100)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 9 May 2024 04:23:51 +0000 (00:23 -0400)
Nobody checks this flag on ext4 folios, stop setting and clearing it.

Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: linux-ext4@vger.kernel.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20240420025029.2166544-11-willy@infradead.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/move_extent.c
fs/ext4/page-io.c
fs/ext4/readpage.c

index 7cd4afa4de1d3127a34ec02f166e90876ad5c6e4..204f53b236229fbb18b8695ee29f333c41a4f01e 100644 (file)
@@ -199,10 +199,8 @@ mext_page_mkuptodate(struct folio *folio, unsigned from, unsigned to)
                        continue;
                if (!buffer_mapped(bh)) {
                        err = ext4_get_block(inode, block, bh, 0);
-                       if (err) {
-                               folio_set_error(folio);
+                       if (err)
                                return err;
-                       }
                        if (!buffer_mapped(bh)) {
                                folio_zero_range(folio, block_start, blocksize);
                                set_buffer_uptodate(bh);
index 312bc68133574db9343098453827c1c132f83424..ad5543866d21526d60e6c12a366b7f64ed18208d 100644 (file)
@@ -117,7 +117,6 @@ static void ext4_finish_bio(struct bio *bio)
 
                if (bio->bi_status) {
                        int err = blk_status_to_errno(bio->bi_status);
-                       folio_set_error(folio);
                        mapping_set_error(folio->mapping, err);
                }
                bh = head = folio_buffers(folio);
@@ -441,8 +440,6 @@ int ext4_bio_write_folio(struct ext4_io_submit *io, struct folio *folio,
        BUG_ON(!folio_test_locked(folio));
        BUG_ON(folio_test_writeback(folio));
 
-       folio_clear_error(folio);
-
        /*
         * Comments copied from block_write_full_folio:
         *
index 21e8f0aebb3c6477c62dff8d80e606f23379b414..8494492582abea86ecd1b33272c349eaefbeb04e 100644 (file)
@@ -289,7 +289,6 @@ int ext4_mpage_readpages(struct inode *inode,
 
                                if (ext4_map_blocks(NULL, inode, &map, 0) < 0) {
                                set_error_page:
-                                       folio_set_error(folio);
                                        folio_zero_segment(folio, 0,
                                                          folio_size(folio));
                                        folio_unlock(folio);