| From: "Matthew Wilcox (Oracle)" <willy@infradead.org> |
| Subject: squashfs: remove calls to set the folio error flag |
| Date: Sat, 20 Apr 2024 03:50:18 +0100 |
| |
| Nobody checks the error flag on squashfs folios, so stop setting it. |
| |
| Link: https://lkml.kernel.org/r/20240420025029.2166544-24-willy@infradead.org |
| 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> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/squashfs/file.c | 6 +----- |
| fs/squashfs/file_direct.c | 3 +-- |
| 2 files changed, 2 insertions(+), 7 deletions(-) |
| |
| --- a/fs/squashfs/file.c~squashfs-remove-calls-to-set-the-folio-error-flag |
| +++ a/fs/squashfs/file.c |
| @@ -375,8 +375,6 @@ void squashfs_fill_page(struct page *pag |
| 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 fi |
| |
| 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 fi |
| if (!res) |
| return 0; |
| |
| -error_out: |
| - SetPageError(page); |
| out: |
| pageaddr = kmap_atomic(page); |
| memset(pageaddr, 0, PAGE_SIZE); |
| --- a/fs/squashfs/file_direct.c~squashfs-remove-calls-to-set-the-folio-error-flag |
| +++ a/fs/squashfs/file_direct.c |
| @@ -106,14 +106,13 @@ int squashfs_readpage_block(struct page |
| 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]); |
| } |
| _ |