ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

squashfs: Return the actual error from squashfs_read_folio()

Browse Source 
Since we actually know what error happened, we can report it instead
of having the generic code return -EIO for pages that were unlocked
without being marked uptodate.  Also remove a test of PageError since
we have the return value at this point.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
This commit is contained in:
Matthew Wilcox (Oracle)
2022-05-26 23:33:43 -04:00
parent b7a6eb22ba
commit 31e748e4b1
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fs/squashfs/file.c
View File

@@ -454,7 +454,7 @@ static int squashfs_read_folio(struct file *file, struct folio *folio)
int expected = index == file_end ? int expected = index == file_end ?
(i_size_read(inode) & (msblk->block_size - 1)) : (i_size_read(inode) & (msblk->block_size - 1)) :
msblk->block_size; msblk->block_size;
int res; int res = 0;
void *pageaddr; void *pageaddr;
TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n", TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n",
@@ -467,14 +467,15 @@ static int squashfs_read_folio(struct file *file, struct folio *folio)
if (index < file_end || squashfs_i(inode)->fragment_block == if (index < file_end || squashfs_i(inode)->fragment_block ==
SQUASHFS_INVALID_BLK) { SQUASHFS_INVALID_BLK) {
u64 block = 0; u64 block = 0;
int bsize = read_blocklist(inode, index, &block);
if (bsize < 0) res = read_blocklist(inode, index, &block);
if (res < 0)
goto error_out; goto error_out;
if (bsize == 0) if (res == 0)
res = squashfs_readpage_sparse(page, expected); res = squashfs_readpage_sparse(page, expected);
else else
res = squashfs_readpage_block(page, block, bsize, expected); res = squashfs_readpage_block(page, block, res, expected);
} else } else
res = squashfs_readpage_fragment(page, expected); res = squashfs_readpage_fragment(page, expected);
@@ -488,11 +489,11 @@ out:
memset(pageaddr, 0, PAGE_SIZE); memset(pageaddr, 0, PAGE_SIZE);
kunmap_atomic(pageaddr); kunmap_atomic(pageaddr);
flush_dcache_page(page); flush_dcache_page(page);
if (!PageError(page)) if (res == 0)
SetPageUptodate(page); SetPageUptodate(page);
unlock_page(page); unlock_page(page);
return 0; return res;
} }