| Message ID | 20240420025029.2166544-24-willy@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove PG_error flag | expand |
On 20/04/2024 03:50, Matthew Wilcox (Oracle) wrote: > Nobody checks the error flag on squashfs folios, so stop setting it. > > Cc: Phillip Lougher <phillip@squashfs.org.uk> > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Tested-by: Phillip Lougher <phillip@squashfs.org.uk> Reviewed-by: Phillip Lougher <phillip@squashfs.org.uk> You've mentioned a couple of times you prefer the patches in the series to go through the fs maintainers. Andrew Morton is currently handling submission of Squashfs patches for me, and I'm happy with either Andrew or you merging it. CC'ing Andrew. Regards Phillip > --- > fs/squashfs/file.c | 6 +----- > fs/squashfs/file_direct.c | 3 +-- > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c > index e8df6430444b..a8c1e7f9a609 100644 > --- a/fs/squashfs/file.c > +++ b/fs/squashfs/file.c > @@ -375,8 +375,6 @@ void squashfs_fill_page(struct page *page, struct squashfs_cache_entry *buffer, > flush_dcache_page(page); > if (copied == avail) > SetPageUptodate(page); > - else > - SetPageError(page); > } > > /* Copy data into page cache */ > @@ -471,7 +469,7 @@ static int squashfs_read_folio(struct file *file, struct folio *folio) > > res = read_blocklist(inode, index, &block); > if (res < 0) > - goto error_out; > + goto out; > > if (res == 0) > res = squashfs_readpage_sparse(page, expected); > @@ -483,8 +481,6 @@ static int squashfs_read_folio(struct file *file, struct folio *folio) > if (!res) > return 0; > > -error_out: > - SetPageError(page); > out: > pageaddr = kmap_atomic(page); > memset(pageaddr, 0, PAGE_SIZE); > diff --git a/fs/squashfs/file_direct.c b/fs/squashfs/file_direct.c > index 763a3f7a75f6..2a689ce71de9 100644 > --- a/fs/squashfs/file_direct.c > +++ b/fs/squashfs/file_direct.c > @@ -106,14 +106,13 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize, > return 0; > > mark_errored: > - /* Decompression failed, mark pages as errored. Target_page is > + /* Decompression failed. Target_page is > * dealt with by the caller > */ > for (i = 0; i < pages; i++) { > if (page[i] == NULL || page[i] == target_page) > continue; > flush_dcache_page(page[i]); > - SetPageError(page[i]); > unlock_page(page[i]); > put_page(page[i]); > }
diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c index e8df6430444b..a8c1e7f9a609 100644 --- a/fs/squashfs/file.c +++ b/fs/squashfs/file.c @@ -375,8 +375,6 @@ void squashfs_fill_page(struct page *page, struct squashfs_cache_entry *buffer, flush_dcache_page(page); if (copied == avail) SetPageUptodate(page); - else - SetPageError(page); } /* Copy data into page cache */ @@ -471,7 +469,7 @@ static int squashfs_read_folio(struct file *file, struct folio *folio) res = read_blocklist(inode, index, &block); if (res < 0) - goto error_out; + goto out; if (res == 0) res = squashfs_readpage_sparse(page, expected); @@ -483,8 +481,6 @@ static int squashfs_read_folio(struct file *file, struct folio *folio) if (!res) return 0; -error_out: - SetPageError(page); out: pageaddr = kmap_atomic(page); memset(pageaddr, 0, PAGE_SIZE); diff --git a/fs/squashfs/file_direct.c b/fs/squashfs/file_direct.c index 763a3f7a75f6..2a689ce71de9 100644 --- a/fs/squashfs/file_direct.c +++ b/fs/squashfs/file_direct.c @@ -106,14 +106,13 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize, return 0; mark_errored: - /* Decompression failed, mark pages as errored. Target_page is + /* Decompression failed. Target_page is * dealt with by the caller */ for (i = 0; i < pages; i++) { if (page[i] == NULL || page[i] == target_page) continue; flush_dcache_page(page[i]); - SetPageError(page[i]); unlock_page(page[i]); put_page(page[i]); }
Nobody checks the error flag on squashfs folios, so stop setting it. Cc: Phillip Lougher <phillip@squashfs.org.uk> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- fs/squashfs/file.c | 6 +----- fs/squashfs/file_direct.c | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-)