[folded-merged] squashfs-cache-partial-compressed-blocks-fix.patch removed from -mm tree

[folded-merged] squashfs-cache-partial-compressed-blocks-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: squashfs-cache-partial-compressed-blocks-fix
has been removed from the -mm tree.  Its filename was
     squashfs-cache-partial-compressed-blocks-fix.patch

This patch was dropped because it was folded into squashfs-cache-partial-compressed-blocks.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: squashfs-cache-partial-compressed-blocks-fix
Date: Wed May 17 04:01:12 PM PDT 2023

fs/squashfs/block.c needs linux/pagemap.h

fs/squashfs/block.c: In function 'squashfs_bio_read_cached':
fs/squashfs/block.c:143:27: error: implicit declaration of function 'add_to_page_cache_lru' [-Werror=implicit-function-declaration]
  143 |                 int ret = add_to_page_cache_lru(head_to_cache, cache_mapping,
      |                           ^~~~~~~~~~~~~~~~~~~~~
fs/squashfs/block.c:148:25: error: implicit declaration of function 'unlock_page'; did you mean 'alloc_page'? [-Werror=implicit-function-declaration]
  148 |                         unlock_page(head_to_cache);
      |                         ^~~~~~~~~~~
      |                         alloc_page
fs/squashfs/block.c: In function 'squashfs_bio_read':
fs/squashfs/block.c:193:32: error: implicit declaration of function 'find_get_page'; did you mean 'find_get_pid'? [-Werror=implicit-function-declaration]
  193 |                         page = find_get_page(cache_mapping,
      |                                ^~~~~~~~~~~~~
      |                                find_get_pid
fs/squashfs/block.c:193:30: error: assignment to 'struct page *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
  193 |                         page = find_get_page(cache_mapping,
      |                              ^
cc1: all warnings being treated as errors
make[3]: *** [scripts/Makefile.build:252: fs/squashfs/block.o] Error 1
make[2]: *** [scripts/Makefile.build:494: fs/squashfs] Error 2
make[1]: *** [scripts/Makefile.build:494: fs] Error 2
make: *** [Makefile:2026: .] Error 2

Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Phillip Lougher <phillip@squashfs.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/squashfs/block.c |    1 +
 1 file changed, 1 insertion(+)

--- a/fs/squashfs/block.c~squashfs-cache-partial-compressed-blocks-fix
+++ a/fs/squashfs/block.c
@@ -17,6 +17,7 @@
 #include <linux/fs.h>
 #include <linux/vfs.h>
 #include <linux/slab.h>
+#include <linux/pagemap.h>
 #include <linux/string.h>
 #include <linux/bio.h>
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix.patch
mm-page_owner-add-page_owner_stacks-file-to-print-out-only-stacks-and-their-counte-fix.patch
mm-page_owner-add-page_owner_stacks-file-to-print-out-only-stacks-and-their-counte-fix-fix.patch
mmpage_owner-filter-out-stacks-by-a-threshold-counter-fix.patch
mm-page_isolation-write-proper-kerneldoc-fix.patch
mm-hugetlb-use-a-folio-in-hugetlb_fault-fix.patch
squashfs-cache-partial-compressed-blocks.patch
squashfs-cache-partial-compressed-blocks-fix-3-fix.patch
init-add-bdev-fs-printk-if-mount_block_root-failed-fix.patch
watchdog-hardlockup-add-comments-to-touch_nmi_watchdog-fix.patch
kexec-add-helper-__crash_shrink_memory-fix.patch