On Sat, 6 May 2023 00:42:36 +0100 Matthew Wilcox <willy@xxxxxxxxxxxxx> wrote: > On Fri, May 05, 2023 at 04:37:27PM -0700, Andrew Morton wrote: > > On Sat, 6 May 2023 00:05:57 +0100 Matthew Wilcox <willy@xxxxxxxxxxxxx> wrote: > > > > > On Fri, May 05, 2023 at 03:43:05PM -0700, Andrew Morton wrote: > > > > > > > > The quilt patch titled > > > > Subject: filemap: fix the conditional folio_put in filemap_fault > > > > has been removed from the -mm tree. Its filename was > > > > filemap-fix-the-conditional-folio_put-in-filemap_fault.patch > > > > > > > > This patch was dropped because it was merged into the mm-hotfixes-stable branch > > > > of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > > > > > > I thought i nacked this? > > > > This? https://lkml.kernel.org/r/ZFMn0zGC58KtQw6N@xxxxxxxxxxxxxxxxxxxx > > > > I interpret that as "doh, never mind"? > > This patch is what I want to see merged: > > ... > > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -3378,7 +3378,7 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) > * re-find the vma and come back and find our hopefully still populated > * page. > */ > - if (folio) > + if (!IS_ERR(folio)) > folio_put(folio); > if (mapping_locked) > filemap_invalidate_unlock_shared(mapping); Oh. And hch preferred the label approach. I'll stick with the patch as-is. Please send an alteration if you feel sufficiently strongly about it.
