Commit 5bd7ef53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull ufs fix from Al Viro:
 "ufs got broken this merge window on folio conversion - calling
  conventions for filemap_lock_folio() are not the same as for
  find_lock_page()"

* tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix ufs_get_locked_folio() breakage
parents af2a9c6a 485053bb

fs/ufs/util.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ struct folio *ufs_get_locked_folio(struct address_space *mapping, 
{

	struct inode *inode = mapping->host;

	struct folio *folio = filemap_lock_folio(mapping, index);

	if (!folio) {

	if (IS_ERR(folio)) {

		folio = read_mapping_folio(mapping, index, NULL);



		if (IS_ERR(folio)) {