This patch series applies on top of fs-next. I suggest it goes through Christian's tree. After applying these two patches, there are no more references to 'struct page' in jffs2. I obviously haven't tested it at all beyond compilation. Matthew Wilcox (Oracle) (2): jffs2: Convert jffs2_do_readpage_nolock to take a folio jffs2: Use a folio in jffs2_garbage_collect_dnode() fs/jffs2/file.c | 24 +++++++++++------------- fs/jffs2/gc.c | 25 ++++++++++++------------- 2 files changed, 23 insertions(+), 26 deletions(-) -- 2.43.0