On Sat, Apr 20, 2024 at 11:50 AM Matthew Wilcox (Oracle) wrote:
>
> Nobody checks this flag on nilfs2 folios, stop setting and clearing it.
> That lets us simplify nilfs_end_folio_io() slightly.
>
> Cc: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxx>
> Cc: linux-nilfs@xxxxxxxxxxxxxxx
> Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Looks good to me. Feel free to send this for merging along with other
PG_error removal patches:
Acked-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxx>
Or if you would like me to pick it up independently (e.g. to gradually
reduce the changes required for removal), I will do so.
Thanks,
Ryusuke Konishi
> ---
> fs/nilfs2/dir.c | 1 -
> fs/nilfs2/segment.c | 8 +-------
> 2 files changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
> index aee40db7a036..a002a44ff161 100644
> --- a/fs/nilfs2/dir.c
> +++ b/fs/nilfs2/dir.c
> @@ -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;
> }
>
> diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
> index aa5290cb7467..8654ab8ad534 100644
> --- a/fs/nilfs2/segment.c
> +++ b/fs/nilfs2/segment.c
> @@ -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);
> }
> --
> 2.43.0
