Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27871790 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next 

Pull squashfs bugfix from Phillip Lougher:
 "Just a single bug fix to the new "directly decompress into the page
  cache" code"

* tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
  Squashfs: fix failure to unlock pages on decompress error
parents d644c026 6d565409

fs/squashfs/file_direct.c

+4 −1
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize) 
		 */

		res = squashfs_read_cache(target_page, block, bsize, pages,

								page);

		if (res < 0)

			goto mark_errored;



		goto out;

	}
@@ -119,7 +122,7 @@ mark_errored: 
	 * dealt with by the caller

	 */

	for (i = 0; i < pages; i++) {

		if (page[i] == target_page)

		if (page[i] == NULL || page[i] == target_page)

			continue;

		flush_dcache_page(page[i]);

		SetPageError(page[i]);