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

torvalds · torvalds · commit 5bd7ef53ffe5 · 2023-12-13T11:09:58.000-08:00
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
diff --git a/fs/ufs/util.c b/fs/ufs/util.c
@@ -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)) {

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ struct folio ufs_get_locked_folio(struct address_space mapping,`
`245`	`245`	`{`
`246`	`246`	`struct inode *inode = mapping->host;`
`247`	`247`	`struct folio *folio = filemap_lock_folio(mapping, index);`
`248`		`- if (!folio) {`
	`248`	`+ if (IS_ERR(folio)) {`
`249`	`249`	`folio = read_mapping_folio(mapping, index, NULL);`
`250`	`250`
`251`	`251`	`if (IS_ERR(folio)) {`