[PATCH 16/30] nilfs2: Remove calls to folio_set_error() and folio_clear_error()

[PATCH 16/30] nilfs2: Remove calls to folio_set_error() and folio_clear_error()

[Matthew Wilcox (Oracle)]

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@gmail.com>
Cc: linux-nilfs@vger.kernel.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 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

Re: [PATCH 16/30] nilfs2: Remove calls to folio_set_error() and folio_clear_error()

[Ryusuke Konishi]

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@gmail.com>
> Cc: linux-nilfs@vger.kernel.org
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

Looks good to me.  Feel free to send this for merging along with other
PG_error removal patches:

Acked-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>

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

Re: [PATCH 16/30] nilfs2: Remove calls to folio_set_error() and folio_clear_error()

[Matthew Wilcox]

On Wed, Apr 24, 2024 at 01:36:52AM +0900, Ryusuke Konishi wrote:
> 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@gmail.com>
> > Cc: linux-nilfs@vger.kernel.org
> > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> 
> Looks good to me.  Feel free to send this for merging along with other
> PG_error removal patches:
> 
> Acked-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
> 
> 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.

Please take it through your tree; I'll prepare a pull request for the
remainder, but having more patches go through fs maintainers means
better testing.

Re: [PATCH 16/30] nilfs2: Remove calls to folio_set_error() and folio_clear_error()

[Ryusuke Konishi]

On Wed, Apr 24, 2024 at 2:51 AM Matthew Wilcox wrote:
>
> On Wed, Apr 24, 2024 at 01:36:52AM +0900, Ryusuke Konishi wrote:
> > 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@gmail.com>
> > > Cc: linux-nilfs@vger.kernel.org
> > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> >
> > Looks good to me.  Feel free to send this for merging along with other
> > PG_error removal patches:
> >
> > Acked-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
> >
> > 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.
>
> Please take it through your tree; I'll prepare a pull request for the
> remainder, but having more patches go through fs maintainers means
> better testing.

I got it, thanks.

Ryusuke Konishi