Commit bbf45b7e authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

squashfs: remove calls to set the folio error flag 

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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: default avatarPhillip Lougher <phillip@squashfs.org.uk>
Reviewed-by: default avatarPhillip Lougher <phillip@squashfs.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 675f02e5

fs/squashfs/file.c

+1 −5
Original line number Diff line number Diff line
@@ -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);

fs/squashfs/file_direct.c

+1 −2
Original line number Diff line number Diff line
@@ -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]);

	}