Commit 58f5f669 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton
Browse files

afs: fix the afs_dir_get_folio return value 

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: 66dabbb6 ("mm: return an ERR_PTR from __filemap_get_folio")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reported-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Tested-by: default avatarDavid Howells <dhowells@redhat.com>
Cc: Marc Dionne <marc.dionne@auristor.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 28a65b49

fs/afs/dir_edit.c

+4 −3
Original line number Diff line number Diff line
@@ -115,11 +115,12 @@ static struct folio *afs_dir_get_folio(struct afs_vnode *vnode, pgoff_t index) 
	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;

}