]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
gfs: don't check for AOP_WRITEPAGE_ACTIVATE in gfs2_write_jdata_batch
authorChristoph Hellwig <hch@lst.de>
Mon, 5 May 2025 09:18:28 +0000 (11:18 +0200)
committerAndreas Gruenbacher <agruenba@redhat.com>
Thu, 22 May 2025 07:12:26 +0000 (09:12 +0200)
__gfs2_jdata_write_folio can't return AOP_WRITEPAGE_ACTIVATE, so don't
check for it in gfs2_write_jdata_batch.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
fs/gfs2/aops.c

index 68fc8af14700d3bdc6d8ee22f095aeeba98b14b4..5be99d87bcdc35a96c7668a9c2ebc99eb9a06e54 100644 (file)
@@ -228,24 +228,16 @@ continue_unlock:
 
                ret = __gfs2_jdata_write_folio(folio, wbc);
                if (unlikely(ret)) {
-                       if (ret == AOP_WRITEPAGE_ACTIVATE) {
-                               folio_unlock(folio);
-                               ret = 0;
-                       } else {
-
-                               /*
-                                * done_index is set past this page,
-                                * so media errors will not choke
-                                * background writeout for the entire
-                                * file. This has consequences for
-                                * range_cyclic semantics (ie. it may
-                                * not be suitable for data integrity
-                                * writeout).
-                                */
-                               *done_index = folio_next_index(folio);
-                               ret = 1;
-                               break;
-                       }
+                       /*
+                        * done_index is set past this page, so media errors
+                        * will not choke background writeout for the entire
+                        * file. This has consequences for range_cyclic
+                        * semantics (ie. it may not be suitable for data
+                        * integrity writeout).
+                        */
+                       *done_index = folio_next_index(folio);
+                       ret = 1;
+                       break;
                }
 
                /*