On Thu, Dec 21, 2023 at 11:18:47AM +1100, Stephen Rothwell wrote: > I have applied the following merge resolution patch: The merge resolution is correct ... > +++ b/fs/netfs/buffered_write.c > @@ -566,7 +566,7 @@ static void netfs_kill_pages(struct address_space *mapping, > folio_end_fscache(folio); > folio_end_writeback(folio); > folio_lock(folio); > - generic_error_remove_page(mapping, folio_page(folio, 0)); but what Dave wrote here is _not_. Call folio_page() when you need to go back from folio to page for something that is intrinsically page based, like kmap(). This isn't that case. This is an interface that hadn't been converted yet, and specifying &folio->page is the correct way to handle this because it's an indication that there is work here to do before we can call the folio conversion complete. Please be more careful.
