Skip to contentSkip to conversation

nilfs2: Remove calls to folio_set_error() and folio_clear_error()

PATCH Applied Ryusuke Konishi 1 participant 1 message Apr 30, 2024 NILFS2 filesystem

lore
Share & tools
lore

Ryusuke Konishi

author maintainer
#0 lore raw

PATCH 1/1 nilfs2: Remove calls to folio_set_error() and folio_clear_error()

From: "Matthew Wilcox (Oracle)" <[email protected]>

Nobody checks this flag on nilfs2 folios, stop setting and clearing it. That lets us simplify nilfs_end_folio_io() slightly.

---
Andrew, please add this to the queue for the next merge window.

This is one of Matthew's PG_error removal series, and is one that is encouraged to be picked up by maintainers if possible. As expected for a cleanup patch, no issues have arisen.

Thanks,
Ryusuke Konishi

 fs/nilfs2/dir.c     | 1 -
 fs/nilfs2/segment.c | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)
fs/nilfs2/dir.c +0 -1
index aee40db7a036..a002a44ff161 100644
@@ -174,7 +174,6 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr)
 		    dir->i_ino, (folio->index << PAGE_SHIFT) + offs,
 		    (unsigned long)le64_to_cpu(p->inode));
 fail:
-	folio_set_error(folio);
 	return false;
 }
 
fs/nilfs2/segment.c +1 -7
index aa5290cb7467..8654ab8ad534 100644
@@ -1725,14 +1725,8 @@ static void nilfs_end_folio_io(struct folio *folio, int err)
 		return;
 	}
 
-	if (!err) {
-		if (!nilfs_folio_buffers_clean(folio))
-			filemap_dirty_folio(folio->mapping, folio);
-		folio_clear_error(folio);
-	} else {
+	if (err || !nilfs_folio_buffers_clean(folio))
 		filemap_dirty_folio(folio->mapping, folio);
-		folio_set_error(folio);
-	}
 
 	folio_end_writeback(folio);
 }
Signature · 1 line
2.34.1