* [merged mm-hotfixes-stable] afs-fix-the-afs_dir_get_folio-return-value.patch removed from -mm tree
@ 2023-05-05 22:43 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2023-05-05 22:43 UTC (permalink / raw)
To: mm-commits, willy, marc.dionne, jack, dhowells, hch, akpm
The quilt patch titled
Subject: afs: fix the afs_dir_get_folio return value
has been removed from the -mm tree. Its filename was
afs-fix-the-afs_dir_get_folio-return-value.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
------------------------------------------------------
From: Christoph Hellwig <hch@lst.de>
Subject: afs: fix the afs_dir_get_folio return value
Date: Wed, 3 May 2023 17:45:26 +0200
Keep returning NULL on failure instead of letting an ERR_PTR escape to
callers that don't expect it.
Link: https://lkml.kernel.org/r/20230503154526.1223095-2-hch@lst.de
Fixes: 66dabbb65d67 ("mm: return an ERR_PTR from __filemap_get_folio")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Jan Kara <jack@suse.cz>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: David Howells <dhowells@redhat.com>
Tested-by: David Howells <dhowells@redhat.com>
Cc: Marc Dionne <marc.dionne@auristor.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/afs/dir_edit.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/fs/afs/dir_edit.c~afs-fix-the-afs_dir_get_folio-return-value
+++ a/fs/afs/dir_edit.c
@@ -115,11 +115,12 @@ static struct folio *afs_dir_get_folio(s
folio = __filemap_get_folio(mapping, index,
FGP_LOCK | FGP_ACCESSED | FGP_CREAT,
mapping->gfp_mask);
- if (IS_ERR(folio))
+ if (IS_ERR(folio)) {
clear_bit(AFS_VNODE_DIR_VALID, &vnode->flags);
- else if (folio && !folio_test_private(folio))
+ return NULL;
+ }
+ if (!folio_test_private(folio))
folio_attach_private(folio, (void *)1);
-
return folio;
}
_
Patches currently in -mm which might be from hch@lst.de are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-05 22:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-05 22:43 [merged mm-hotfixes-stable] afs-fix-the-afs_dir_get_folio-return-value.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.